diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2019-06-27 20:13:24 -0400 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2019-08-10 22:30:29 -0400 |
| commit | ff7387c18860e54c28a19cb08b5adeba8a64a193 (patch) | |
| tree | e5bb1b6a69b40174b48010aae5e2f3ae4654c780 /init.el | |
| parent | b2b47cfbfd6107c784c4a752ace17c321a7a467d (diff) | |
| download | emacs.d-ff7387c18860e54c28a19cb08b5adeba8a64a193.tar.gz | |
magit: Add command for doing fast-forward merge of push branch
Diffstat (limited to 'init.el')
| -rw-r--r-- | init.el | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -1005,6 +1005,8 @@ (transient-suffix-put 'magit-push "u" :key "U") (transient-suffix-put 'magit-push "p" :key "P") + (transient-suffix-put 'magit-merge "p" :key "P") + (setf (alist-get 'magit-show-refs transient-values) (list "--sort=-committerdate")) @@ -1152,6 +1154,9 @@ (transient-append-suffix 'magit-merge "m" '("u" "Merge upstream" km/magit-ff-merge-upstream)) + (transient-append-suffix 'magit-merge "u" + '("p" "Merge push" km/magit-ff-merge-push)) + (transient-append-suffix 'magit-branch "b" '("c" "Create & checkout from current" km/magit-branch-and-checkout-from-current)) |