summaryrefslogtreecommitdiff
path: root/init.el
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2020-04-16 23:31:50 -0400
committerKyle Meyer <kyle@kyleam.com>2020-04-16 23:54:15 -0400
commite67aad0a179e46b4658bde2262d751a656e10ea9 (patch)
treefb330f0041565e3dea663a22b4cc866f33a3a2d2 /init.el
parent1cd8435c566189ca3dfe0615a1b7d4ccb0357624 (diff)
downloademacs.d-e67aad0a179e46b4658bde2262d751a656e10ea9.tar.gz
magit: Reconcile branch transient keys
My branch popup has a good number of key changes and custom commands. Things got in a pretty bad state with the Transient switch. Try to fix that.
Diffstat (limited to 'init.el')
-rw-r--r--init.el17
1 files changed, 13 insertions, 4 deletions
diff --git a/init.el b/init.el
index b8fb980..203acb1 100644
--- a/init.el
+++ b/init.el
@@ -999,12 +999,18 @@
(transient-append-suffix 'magit-log-refresh "g"
'("m" "Modify range" km/magit-log-modify-range))
+ (transient-suffix-put 'magit-branch "d" :key "D")
+ (transient-suffix-put 'magit-branch-configure "d" :key "D")
+ (transient-suffix-put 'magit-branch "r" :key "R")
+ (transient-suffix-put 'magit-branch-configure "r" :key "R")
+
+ (transient-suffix-put 'magit-branch "o" :key "O")
(transient-suffix-put 'magit-branch "c" :key "o")
- (transient-suffix-put 'magit-branch "C" :key "S")
(transient-suffix-put 'magit-branch "n" :key "C")
- (transient-suffix-put 'magit-branch "r" :key "R")
+ (transient-suffix-put 'magit-branch "s" :key "n")
+ (transient-suffix-put 'magit-branch "S" :key "N")
+ (transient-suffix-put 'magit-branch "C" :key "S")
(transient-suffix-put 'magit-branch "m" :key "r")
- (transient-suffix-put 'magit-branch "s" :key "v")
(transient-suffix-put 'magit-push "u" :key "U")
(transient-suffix-put 'magit-push "p" :key "P")
@@ -1177,7 +1183,10 @@
'("d" "Copy branch" km/magit-branch-copy))
(transient-append-suffix 'magit-branch "r"
- '("s" "Backup current branch" km/magit-branch-checkpoint))
+ '("v" "Back up current branch, cp" km/magit-branch-checkpoint))
+
+ (transient-append-suffix 'magit-branch "v"
+ '("V" "Back up current branch, v" km/magit-branch-version))
(transient-append-suffix 'magit-branch "c"
'("m" "Checkout master" km/magit-checkout-master)))