From 3052907751d77c7df9950ad88091a086d1b5a7c7 Mon Sep 17 00:00:00 2001
From: Case Duckworth
Date: Mon, 1 Mar 2021 16:30:28 -0600
Subject: Show magit in the same window as the file

---
 init.el | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'init.el')

diff --git a/init.el b/init.el
index b2967aa..53dc088 100644
--- a/init.el
+++ b/init.el
@@ -499,7 +499,12 @@
 (use-package magit
     :bind ("C-x g" . magit-status)
     :init (when (eq acdw/system :work)
-	    (setenv "GIT_ASKPASS" "git-gui--askpass")))
+	    (setenv "GIT_ASKPASS" "git-gui--askpass"))
+    (defun magit-display-buffer-same-window (buffer)
+      "Show `magit' in the same buffer, like god intended."
+      (display-buffer buffer '(display-buffer-same-window)))
+    (setq magit-display-buffer-function 'magit-display-buffer-same-window
+	  magit-popup-display-buffer-action '((display-buffer-same-window))))
 (use-package forge
     :after magit)
 (use-package gitattributes-mode
-- 
cgit 1.4.1-21-gabe81