From 96833fdb6414a359bfd58a13cef5ad89bdbf2bef Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 18 Mar 2021 13:24:24 +0000 Subject: modules/emacs: disable magit-commit diff buffer --- modules/workstation/emacs/init.el | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'modules') diff --git a/modules/workstation/emacs/init.el b/modules/workstation/emacs/init.el index ecc84310969e..154f6953d62b 100644 --- a/modules/workstation/emacs/init.el +++ b/modules/workstation/emacs/init.el @@ -137,6 +137,15 @@ (global-set-key (kbd "C-x g") #'magit-status) (global-set-key (kbd "C-x M-g") #'magit-dispatch) +;; Don't open a second window with a diff when committing. I have +;; commit.verbose set in git, so the diff is shown below the commit +;; anyway, and it's annoying to have magit take over the whole frame +;; because it means I can't refer to something else, like an email +;; thread discussing the commit. And sometimes the diff shown by +;; magit doesn't agree with the diff shown by git (and git is always +;; in the right when this happens). +(setq magit-commit-show-diff nil) + (with-eval-after-load "magit" (define-key magit-process-mode-map (kbd "k") #'magit-process-kill) -- cgit 1.4.1