diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-03-18 13:24:24 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-03-24 12:15:59 +0000 |
| commit | 96833fdb6414a359bfd58a13cef5ad89bdbf2bef (patch) | |
| tree | 84a5d345611fa639f1628c89b95e8a2be12c6818 /modules/workstation/emacs/init.el | |
| parent | 74aecec660b0c263b8ef44f8cbe35f75a00f73d5 (diff) | |
| download | nixlib-96833fdb6414a359bfd58a13cef5ad89bdbf2bef.tar nixlib-96833fdb6414a359bfd58a13cef5ad89bdbf2bef.tar.gz nixlib-96833fdb6414a359bfd58a13cef5ad89bdbf2bef.tar.bz2 nixlib-96833fdb6414a359bfd58a13cef5ad89bdbf2bef.tar.lz nixlib-96833fdb6414a359bfd58a13cef5ad89bdbf2bef.tar.xz nixlib-96833fdb6414a359bfd58a13cef5ad89bdbf2bef.tar.zst nixlib-96833fdb6414a359bfd58a13cef5ad89bdbf2bef.zip | |
modules/emacs: disable magit-commit diff buffer
Diffstat (limited to 'modules/workstation/emacs/init.el')
| -rw-r--r-- | modules/workstation/emacs/init.el | 9 |
1 files changed, 9 insertions, 0 deletions
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) |