summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--emacs.d/custom/fcuny-git.el13
1 files changed, 4 insertions, 9 deletions
diff --git a/emacs.d/custom/fcuny-git.el b/emacs.d/custom/fcuny-git.el
index f9e985d..eb43040 100644
--- a/emacs.d/custom/fcuny-git.el
+++ b/emacs.d/custom/fcuny-git.el
@@ -11,17 +11,12 @@
 
 (use-package magit
   :ensure t
-  :commands magit-status
+  :mode (("\\COMMIT_EDITMSG\\'" . text-mode)
+         ("\\MERGE_MSG\\'"      . text-mode))
   :after (flyspell)
-  :hook ((magit-mode . hl-line-mode))
-  :bind (("C-x g s" . magit-status))
+  :bind (("C-x g" . magit-status))
   :custom
   (git-commit-summary-max-length 50)
-  (fill-column 72)
-  (magit-display-buffer-function #'magit-display-buffer-fullframe-status-v1)
-  (magit-completing-read-function 'ivy-completing-read)
-  :config
-  (when (fcuny/check-work-machine-p)
-    (setq magit-git-executable "/opt/twitter_mde/bin/git")))
+  (fill-column 72))
 
 (provide 'fcuny-git)