summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2014-09-22 00:56:11 -0400
committerKyle Meyer <kyle@kyleam.com>2014-09-22 00:56:11 -0400
commitf3cbf040687265c01f26057b3b3b1f0867b982ff (patch)
tree174f42bf77733d7e7ae20702110c93f9e556db91
parent3bccec8ae8bbc7020882f48093938bb0814b6132 (diff)
downloademacs.d-f3cbf040687265c01f26057b3b3b1f0867b982ff.tar.gz
Always set --no-ff with magit-merge-editmsg
-rw-r--r--lisp/init-git.el5
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/init-git.el b/lisp/init-git.el
index 0ae7034..99daf30 100644
--- a/lisp/init-git.el
+++ b/lisp/init-git.el
@@ -112,6 +112,11 @@ START-POINT set to the current branch.
(magit-define-popup-action 'magit-branch-popup
?m "Checkout master" 'km/magit-checkout-master)
+ (defadvice magit-merge-editmsg (around km/magit-merge-editmsg-no-ff activate)
+ "Set '--no-ff' flag when running `magit-merge-editmsg'."
+ (let ((args '("--no-ff")))
+ ad-do-it))
+
(setq magit-branch-arguments
(delete "--track" magit-branch-arguments)))