about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorCase Duckworth2021-03-01 16:30:28 -0600
committerCase Duckworth2021-03-01 16:30:28 -0600
commit3052907751d77c7df9950ad88091a086d1b5a7c7 (patch)
tree34cd1ce0ecce9bd5a8cf0c9c73235d68d3814235
parentMove straight install directory (diff)
downloademacs-3052907751d77c7df9950ad88091a086d1b5a7c7.tar.gz
emacs-3052907751d77c7df9950ad88091a086d1b5a7c7.zip
Show magit in the same window as the file
-rw-r--r--init.el7
1 files changed, 6 insertions, 1 deletions
diff --git a/init.el b/init.el index b2967aa..53dc088 100644 --- a/init.el +++ b/init.el
@@ -499,7 +499,12 @@
499(use-package magit 499(use-package magit
500 :bind ("C-x g" . magit-status) 500 :bind ("C-x g" . magit-status)
501 :init (when (eq acdw/system :work) 501 :init (when (eq acdw/system :work)
502 (setenv "GIT_ASKPASS" "git-gui--askpass"))) 502 (setenv "GIT_ASKPASS" "git-gui--askpass"))
503 (defun magit-display-buffer-same-window (buffer)
504 "Show `magit' in the same buffer, like god intended."
505 (display-buffer buffer '(display-buffer-same-window)))
506 (setq magit-display-buffer-function 'magit-display-buffer-same-window
507 magit-popup-display-buffer-action '((display-buffer-same-window))))
503(use-package forge 508(use-package forge
504 :after magit) 509 :after magit)
505(use-package gitattributes-mode 510(use-package gitattributes-mode