aboutsummaryrefslogtreecommitdiff
path: root/lisp/magit-subtree.el
diff options
context:
space:
mode:
authorJonas Bernoulli <jonas@bernoul.li>2019-01-25 19:00:34 +0100
committerJonas Bernoulli <jonas@bernoul.li>2019-02-14 20:17:36 +0100
commitf7c14f273a91cea5882fa729cf992e12c9b8ca76 (patch)
tree90774aafeaada8ee129b48fbf890da1b1866960c /lisp/magit-subtree.el
parent8705aab3fd77d63a18a14f1f8d874cce72e69326 (diff)
Use same suffix section for switches and options
Magit-Popup used separate sections for switches and options. Transient doesn't have that limitation.
Diffstat (limited to 'lisp/magit-subtree.el')
-rw-r--r--lisp/magit-subtree.el18
1 files changed, 8 insertions, 10 deletions
diff --git a/lisp/magit-subtree.el b/lisp/magit-subtree.el
index aca8a87..0ee7459 100644
--- a/lisp/magit-subtree.el
+++ b/lisp/magit-subtree.el
@@ -39,11 +39,10 @@
(define-transient-command magit-subtree-import ()
"Import subtrees."
:man-page "git-subtree"
- ["Switches"
- ("-s" "Squash" "--squash")]
- ["Options"
- ("=p" "Prefix" "--prefix=" magit-subtree-read-prefix)
- ("=m" "Message" "--message=")]
+ ["Arguments"
+ ("=p" "Prefix" "--prefix=" magit-subtree-read-prefix)
+ ("=m" "Message" "--message=")
+ ("-s" "Squash" "--squash")]
["Actions"
[("a" "Add" magit-subtree-add)
("c" "Add commit" magit-subtree-add-commit)]
@@ -54,14 +53,13 @@
(define-transient-command magit-subtree-export ()
"Export subtrees."
:man-page "git-subtree"
- ["Switches"
- ("-i" "Ignore joins" "--ignore-joins")
- ("-j" "Rejoin" "--rejoin")]
- ["Options"
+ ["Arguments"
("=p" "Prefix" "--prefix=" magit-subtree-read-prefix)
("=a" "Annotate" "--annotate=")
("=b" "Branch" "--branch=")
- ("=o" "Onto" "--onto=" magit-transient-read-revision)]
+ ("=o" "Onto" "--onto=" magit-transient-read-revision)
+ ("-i" "Ignore joins" "--ignore-joins")
+ ("-j" "Rejoin" "--rejoin")]
["Actions"
("p" "Push" magit-subtree-push)
("s" "Split" magit-subtree-split)])