diff options
author | Kyle Meyer <kyle@kyleam.com> | 2016-06-12 23:50:45 -0400 |
---|---|---|
committer | Kyle Meyer <kyle@kyleam.com> | 2016-06-12 23:50:45 -0400 |
commit | 240061b43c9362cfd9bc4efdbbeb1cfd11b1415a (patch) | |
tree | 131f94cf85fca1574ac3f2b0d0601551ebe65a9b | |
parent | 9ecc49bf5b7d192b1935df1fffdb04b9f77562b8 (diff) | |
download | emacs.d-240061b43c9362cfd9bc4efdbbeb1cfd11b1415a.tar.gz |
Remove unnecessary magit-merge-editmsg advice
Not needed since Magit's afe10a6 (magit-merge-editmsg: always use
--no-ff, 2016-04-16).
-rw-r--r-- | init.el | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -932,11 +932,7 @@ (lambda (fn &rest args) (let ((magit-process-popup-time 0)) (apply fn args))) - '((name . "magit-fetch-process"))) - (advice-add - 'magit-merge-editmsg :around - (lambda (f rev &rest _) (funcall f rev "--no-ff")) - '((name . "no-ff")))) + '((name . "magit-fetch-process")))) (use-package magit-wip :defer t |