From 4ebd6c7428734c50de0a484932b2d3f649bb2080 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Tue, 19 Sep 2017 19:00:59 +0200 Subject: [PATCH 1/2] Update magit-imerge to v0.2.0 --- lib/magit-imerge | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/magit-imerge b/lib/magit-imerge index ea578e8..1cd0fa8 160000 --- a/lib/magit-imerge +++ b/lib/magit-imerge @@ -1 +1 @@ -Subproject commit ea578e8adf1ba2f98934660bd9db01cfc074b334 +Subproject commit 1cd0fa843095f4ce8aa4eae89476c116414d060c From 2325e4b4a9bf6e3099a1434457dca2368b5e46ca Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Tue, 19 Sep 2017 19:02:02 +0200 Subject: [PATCH 2/2] magit: add ~/.emacs.d and drones to magit-repository-directories --- init.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/init.el b/init.el index 36b4bd4..ea919b9 100644 --- a/init.el +++ b/init.el @@ -153,6 +153,8 @@ ;; Global settings (add-hook 'after-save-hook 'magit-after-save-refresh-status t) (global-magit-file-mode) + (add-to-list 'magit-repository-directories (cons "~/.emacs.d/" 0)) + (add-to-list 'magit-repository-directories (cons "~/.emacs.d/lib/" 1)) ;; ;; Commit settings (setq magit-commit-extend-override-date nil)