summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.org8
-rw-r--r--init.el5
2 files changed, 13 insertions, 0 deletions
diff --git a/README.org b/README.org
index 1fd281a..60d7fae 100644
--- 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 9e3abf9..990bcec 100644
--- 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")