aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lisp/magit-blame.el5
-rw-r--r--lisp/magit-commit.el7
-rw-r--r--lisp/magit-fetch.el2
-rw-r--r--lisp/magit-merge.el6
-rw-r--r--lisp/magit-notes.el6
-rw-r--r--lisp/magit-patch.el7
-rw-r--r--lisp/magit-push.el2
-rw-r--r--lisp/magit-refs.el19
-rw-r--r--lisp/magit-remote.el2
-rw-r--r--lisp/magit-sequence.el24
-rw-r--r--lisp/magit-stash.el2
-rw-r--r--lisp/magit-submodule.el2
-rw-r--r--lisp/magit-subtree.el18
-rw-r--r--lisp/magit-tag.el5
14 files changed, 46 insertions, 61 deletions
diff --git a/lisp/magit-blame.el b/lisp/magit-blame.el
index 70ce2d7..82a382d 100644
--- a/lisp/magit-blame.el
+++ b/lisp/magit-blame.el
@@ -891,10 +891,9 @@ instead of the hash, like `kill-ring-save' would."
"Show the commits that added or removed lines in the visited file."
:man-page "git-blame"
:value '("-w")
- ["Switches"
+ ["Arguments"
("-w" "Ignore whitespace" "-w")
- ("-r" "Do not treat root commits as boundaries" "--root")]
- ["Options"
+ ("-r" "Do not treat root commits as boundaries" "--root")
("=M" "Detect lines moved or copied within a file" "-M" read-string)
("=C" "Detect lines moved or copied between files" "-C" read-string)]
["Actions"
diff --git a/lisp/magit-commit.el b/lisp/magit-commit.el
index 22ab84a..77a692e 100644
--- a/lisp/magit-commit.el
+++ b/lisp/magit-commit.el
@@ -103,14 +103,13 @@ Also see `git-commit-post-finish-hook'."
"Create a new commit or replace an existing commit."
:info-manual "(magit)Initiating a Commit"
:man-page "git-commit"
- ["Switches"
+ ["Arguments"
("-a" "Stage all modified and deleted files" ("-a" "--all"))
("-e" "Allow empty commit" "--allow-empty")
("-v" "Show diff of changes to be committed" ("-v" "--verbose"))
("-h" "Disable hooks" ("-n" "--no-verify"))
("-s" "Add Signed-off-by line" ("-s" "--signoff"))
- ("-R" "Claim authorship and reset author date" "--reset-author")]
- ["Options"
+ ("-R" "Claim authorship and reset author date" "--reset-author")
("=A" "Override the author" magit:--author)
("=S" "Sign using gpg" "--gpg-sign=" magit-read-gpg-secret-key)
("=C" "Reuse commit message" "--reuse-message=" magit-read-reuse-message)]
@@ -395,7 +394,7 @@ history element."
With a prefix argument use a transient command to select infix
arguments. This command requires the git-autofixup script, which
is available from https://github.com/torbiak/git-autofixup."
- ["Switches"
+ ["Arguments"
("-c" "Diff context lines" ("-c" "--context="))
("-s" "Strictness" ("-s" "--strict="))]
["Actions"
diff --git a/lisp/magit-fetch.el b/lisp/magit-fetch.el
index c606bae..075fed1 100644
--- a/lisp/magit-fetch.el
+++ b/lisp/magit-fetch.el
@@ -44,7 +44,7 @@ Ignored for Git versions before v2.8.0."
(define-transient-command magit-fetch ()
"Fetch from another repository."
:man-page "git-fetch"
- ["Switches"
+ ["Arguments"
("-p" "Prune deleted branches" ("-p" "--prune"))]
["Fetch from"
("p" magit-fetch-from-pushremote
diff --git a/lisp/magit-merge.el b/lisp/magit-merge.el
index 37e471b..ad4e4f5 100644
--- a/lisp/magit-merge.el
+++ b/lisp/magit-merge.el
@@ -40,12 +40,10 @@
(define-transient-command magit-merge ()
"Merge branches."
:man-page "git-merge"
- ["Switches"
+ ["Arguments"
:if-not magit-merge-in-progress-p
("-f" "Fast-forward only" "--ff-only")
- ("-n" "No fast-forward" "--no-ff")]
- ["Options"
- :if-not magit-merge-in-progress-p
+ ("-n" "No fast-forward" "--no-ff")
("=s" "Strategy" "--strategy=")]
["Actions"
:if-not magit-merge-in-progress-p
diff --git a/lisp/magit-notes.el b/lisp/magit-notes.el
index 1d699dd..345b71b 100644
--- a/lisp/magit-notes.el
+++ b/lisp/magit-notes.el
@@ -41,13 +41,13 @@
["Configure global settings"
("C" magit-global-core.notesRef)
("D" magit-global-notes.displayRef)]
- ["Switch for prune"
+ ["Arguments for prune"
:if-not magit-notes-merging-p
("-n" "Dry run" ("-n" "--dry-run"))]
- ["Option for edit and remove"
+ ["Arguments for edit and remove"
:if-not magit-notes-merging-p
("=r" "Manipulate ref" "--ref=" magit-notes-read-ref)]
- ["Option for merge"
+ ["Arguments for merge"
:if-not magit-notes-merging-p
("=s" "Merge strategy" "--strategy=")]
["Actions"
diff --git a/lisp/magit-patch.el b/lisp/magit-patch.el
index 7dd712a..0f2b6fd 100644
--- a/lisp/magit-patch.el
+++ b/lisp/magit-patch.el
@@ -65,9 +65,8 @@ changes introduced by that commit (unlike 'git format-patch'
which creates patches for all commits that are reachable from
`HEAD' but not from the specified commit)."
:man-page "git-format-patch"
- ["Switches for formatting patches"
- ("-l" "Add cover letter" "--cover-letter")]
- ["Options for formatting patches"
+ ["Arguments"
+ ("-l" "Add cover letter" "--cover-letter")
("=f" "From" "--from=")
("=t" "To" "--to=")
("=c" "CC" "--cc=")
@@ -111,7 +110,7 @@ which creates patches for all commits that are reachable from
(define-transient-command magit-patch-apply (file &rest args)
"Apply the patch file FILE."
:man-page "git-apply"
- ["Switches"
+ ["Arguments"
("-i" "Also apply to index" "--index")
("-c" "Only apply to index" "--cached")
("-3" "Fall back on 3way merge" ("-3" "--3way"))]
diff --git a/lisp/magit-push.el b/lisp/magit-push.el
index d0e5882..6a82691 100644
--- a/lisp/magit-push.el
+++ b/lisp/magit-push.el
@@ -38,7 +38,7 @@
(define-transient-command magit-push ()
"Push to another repository."
:man-page "git-push"
- ["Switches"
+ ["Arguments"
("-f" "Force with lease" (nil "--force-with-lease"))
("-F" "Force" ("-f" "--force"))
("-h" "Disable hooks" "--no-verify")
diff --git a/lisp/magit-refs.el b/lisp/magit-refs.el
index d59361b..cd4d4d1 100644
--- a/lisp/magit-refs.el
+++ b/lisp/magit-refs.el
@@ -326,16 +326,15 @@ Type \\[magit-reset] to reset `HEAD' to the commit at point.
(define-transient-command magit-show-refs (&optional transient)
"List and compare references in a dedicated buffer."
:man-page "git-branch"
- ["Switches"
- ("-m" "Merged to HEAD" "--merged")
- ("-M" "Merged to master" "--merged=master")
- ("-n" "Not merged to HEAD" "--no-merged")
- ("-N" "Not merged to master" "--no-merged=master")]
- ["Options"
- ("=c" "Contains" "--contains=" magit-transient-read-revision)
- ("=m" "Merged" "--merged=" magit-transient-read-revision)
- ("=n" "Not merged" "--no-merged=" magit-transient-read-revision)
- ("=s" "Sort" "--sort=" magit-read-ref-sort)]
+ ["Arguments"
+ ("=c" "Contains" "--contains=" magit-transient-read-revision)
+ ("=m" "Merged" "--merged=" magit-transient-read-revision)
+ ("-m" "Merged to HEAD" "--merged")
+ ("-M" "Merged to master" "--merged=master")
+ ("=n" "Not merged" "--no-merged=" magit-transient-read-revision)
+ ("-n" "Not merged to HEAD" "--no-merged")
+ ("-N" "Not merged to master" "--no-merged=master")
+ ("=s" "Sort" "--sort=" magit-read-ref-sort)]
["Actions"
("y" "Show refs, comparing them with HEAD" magit-show-refs-head)
("c" "Show refs, comparing them with current branch" magit-show-refs-current)
diff --git a/lisp/magit-remote.el b/lisp/magit-remote.el
index 8630b50..495ed19 100644
--- a/lisp/magit-remote.el
+++ b/lisp/magit-remote.el
@@ -98,7 +98,7 @@ removed after restarting Emacs."
("s" magit-remote.<remote>.pushurl)
("S" magit-remote.<remote>.push)
("O" magit-remote.<remote>.tagopt)]
- ["Switches for add"
+ ["Arguments for add"
("-f" "Fetch after add" "-f")]
["Actions"
[("a" "Add" magit-remote-add)
diff --git a/lisp/magit-sequence.el b/lisp/magit-sequence.el
index a1a344a..e434a63 100644
--- a/lisp/magit-sequence.el
+++ b/lisp/magit-sequence.el
@@ -127,16 +127,14 @@ This discards all changes made since the sequence started."
"Apply or transplant commits."
:man-page "git-cherry-pick"
:value '("--ff")
- ["Switches"
+ ["Arguments"
:if-not magit-sequencer-in-progress-p
("-s" "Add Signed-off-by lines" ("-s" "--signoff"))
("-e" "Edit commit messages" ("-e" "--edit"))
("-x" "Reference cherry in commit message" "-x")
- ("-F" "Attempt fast-forward" "--ff")]
- ["Options"
- :if-not magit-sequencer-in-progress-p
- ("=s" "Strategy" "--strategy=")
- ("=m" "Replay merge relative to parent" "--mainline=")]
+ ("-F" "Attempt fast-forward" "--ff")
+ ("=s" "Strategy" "--strategy=")
+ ("=m" "Replay merge relative to parent" "--mainline=")]
[:if-not magit-sequencer-in-progress-p
["Apply here"
("A" "Pick" magit-cherry-copy)
@@ -339,13 +337,11 @@ the process manually."
"Revert existing commits, with or without creating new commits."
:man-page "git-revert"
:value '("--edit")
- ["Switches"
+ ["Arguments"
:if-not magit-sequencer-in-progress-p
("-s" "Add Signed-off-by lines" ("-s" "--signoff"))
("-e" "Edit commit message" ("-e" "--edit"))
- ("-E" "Don't edit commit message" "--no-edit")]
- ["Options"
- :if-not magit-sequencer-in-progress-p
+ ("-E" "Don't edit commit message" "--no-edit")
("=s" "Strategy" "--strategy=")
("=S" "Sign using gpg" "--gpg-sign=" magit-read-gpg-secret-key)
("=m" "Replay merge relative to parent" "--mainline=")]
@@ -393,18 +389,16 @@ without prompting."
"Apply patches received by email."
:man-page "git-am"
:value '("--3way")
- ["Switches"
+ ["Arguments"
:if-not magit-am-in-progress-p
("-3" "Fall back on 3way merge" ("-3" "--3way"))
("-s" "Add Signed-off-by lines" ("-s" "--signoff"))
+ ("=p" "Remove leading slashes from paths" "-p" magit-read-number-string)
("-c" "Remove text before scissors line" ("-c" "--scissors"))
("-k" "Inhibit removal of email cruft" ("-k" "--keep"))
("-b" "Limit removal of email cruft" "--keep-non-patch")
("-d" "Use author date as committer date" "--committer-date-is-author-date")
("-D" "Use committer date as author date" "--ignore-date")]
- ["Options"
- :if-not magit-am-in-progress-p
- ("=p" "Remove leading slashes from paths" "-p" magit-read-number-string)]
["Apply"
:if-not magit-am-in-progress-p
("m" "maildir" magit-am-apply-maildir)
@@ -479,7 +473,7 @@ This discards all changes made since the sequence started."
(define-transient-command magit-rebase ()
"Transplant commits and/or modify existing commits."
:man-page "git-rebase"
- ["Switches"
+ ["Arguments"
:if-not magit-rebase-in-progress-p
("-k" "Keep empty commits" "--keep-empty")
("-p" "Preserve merges" ("-p" "--preserve-merges"))
diff --git a/lisp/magit-stash.el b/lisp/magit-stash.el
index 7f4a1dc..f156fa5 100644
--- a/lisp/magit-stash.el
+++ b/lisp/magit-stash.el
@@ -88,7 +88,7 @@ AUTHOR-WIDTH has to be an integer. When the name of the author
(define-transient-command magit-stash ()
"Stash uncommitted changes."
:man-page "git-stash"
- ["Switches"
+ ["Arguments"
("-u" "Also save untracked files" ("-u" "--include-untracked"))
("-a" "Also save untracked and ignored files" ("-a" "--all"))]
[["Stash"
diff --git a/lisp/magit-submodule.el b/lisp/magit-submodule.el
index 3e7c4ad..90d8f9e 100644
--- a/lisp/magit-submodule.el
+++ b/lisp/magit-submodule.el
@@ -119,7 +119,7 @@ and also setting this variable to t will lead to tears."
(define-transient-command magit-submodule ()
"Act on a submodule."
:man-page "git-submodule"
- ["Switches"
+ ["Arguments"
("-f" "Force" ("-f" "--force"))
("-r" "Recursive" "--recursive")
("-N" "Do not fetch" ("-N" "--no-fetch"))
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)])
diff --git a/lisp/magit-tag.el b/lisp/magit-tag.el
index e6587b2..9a9ae03 100644
--- a/lisp/magit-tag.el
+++ b/lisp/magit-tag.el
@@ -33,11 +33,10 @@
(define-transient-command magit-tag ()
"Create or delete a tag."
:man-page "git-tag"
- ["Switches"
+ ["Arguments"
("-f" "Force" ("-f" "--force"))
("-a" "Annotate" ("-a" "--annotate"))
- ("-s" "Sign" ("-s" "--sign"))]
- ["Options"
+ ("-s" "Sign" ("-s" "--sign"))
("=f" "Sign as" "--local-user=" magit-read-gpg-secret-key)]
[["Create"
("t" "tag" magit-tag-create)
generated by cgit v1.0 at 2026-05-27 07:28:31 +0000