Add magit

diff --git a/README.org b/README.org
index 1fd281af7f47510f9435e9cd08357d3cbb44afe2..60d7fae9bf971743ad87eb725b8f37b7bd35af1a 100644 (file)
--- a/README.org
+++ b/README.org
@@ -122,6 +122,14 @@ These settings ensure that block highlights aren't visible when collapsed.
   (use-package counsel-projectile
     :config (counsel-projectile-mode))
 #+end_src
+* Version Control
+** Magit
+#+begin_src lisp
+  (use-package magit
+    :commands (magit-status magit-get-current-branch)
+    :custom
+    (magit-display-buffer-function #'magit-display-buffer-same-window-except-diff-v1))
+#+end_src
 * 42
 ** Header
 #+begin_src elisp

diff --git a/init.el b/init.el
index 9e3abf97555c3dfbf13d90e272f0c7a15fc2b59e..990bcec0015d06107502261a87ddd4bf368c44ec 100644 (file)
--- a/init.el
+++ b/init.el
@@ -76,4 +76,9 @@
 (use-package counsel-projectile
   :config (counsel-projectile-mode))
 
+(use-package magit
+  :commands (magit-status magit-get-current-branch)
+  :custom
+  (magit-display-buffer-function #'magit-display-buffer-same-window-except-diff-v1))
+
 (load "~/.config/emacs/42header.el")