diff options
author | Kyle Meyer <kyle@kyleam.com> | 2017-12-31 11:41:04 -0500 |
---|---|---|
committer | Kyle Meyer <kyle@kyleam.com> | 2017-12-31 11:45:45 -0500 |
commit | 363e8d35f47069deba4bb00ce46f8bd6cdaf5a2c (patch) | |
tree | e2099a9895c605a8ba7b75fed8837ed4a0a2a03c /init.el | |
parent | a6ea7d04f89b86531d96a016fcb1d58ba64b678e (diff) | |
download | emacs.d-363e8d35f47069deba4bb00ce46f8bd6cdaf5a2c.tar.gz |
magit: Modify message for refs/pull/ merges
Diffstat (limited to 'init.el')
-rw-r--r-- | init.el | 11 |
1 files changed, 10 insertions, 1 deletions
@@ -1032,7 +1032,16 @@ (lambda (fn &rest args) (let ((magit-process-popup-time 0)) (apply fn args))) - '((name . "magit-fetch-process")))) + '((name . "magit-fetch-process"))) + + (advice-add 'magit-merge + :around + (lambda (fn rev &optional args &rest other) + (let ((msg (km/magit-merge-pull-message rev))) + (when msg + (push (format "-m%s" msg) args))) + (apply fn rev args other)) + '((name . "magit-merge-check-pull")))) (use-package git-rebase :defer t |