From f3cbf040687265c01f26057b3b3b1f0867b982ff Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Mon, 22 Sep 2014 00:56:11 -0400 Subject: Always set --no-ff with magit-merge-editmsg --- lisp/init-git.el | 5 +++++ 1 file changed, 5 insertions(+) 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))) -- cgit v1.2.3