diff --git a/init.el b/init.el index cad1b5c..dc39775 100644 --- a/init.el +++ b/init.el @@ -170,6 +170,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) 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