[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/git-commit 2b02bfb049 2/2: magit-reset: Add magit-branch-r
|
From: |
ELPA Syncer |
|
Subject: |
[nongnu] elpa/git-commit 2b02bfb049 2/2: magit-reset: Add magit-branch-reset |
|
Date: |
Fri, 3 Nov 2023 13:00:45 -0400 (EDT) |
branch: elpa/git-commit
commit 2b02bfb0495bf738e006d82f3a233e8f511b90b8
Author: Jonas Bernoulli <jonas@bernoul.li>
Commit: Jonas Bernoulli <jonas@bernoul.li>
magit-reset: Add magit-branch-reset
---
lisp/magit-reset.el | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/lisp/magit-reset.el b/lisp/magit-reset.el
index 2a0e26b774..1d52b2a654 100644
--- a/lisp/magit-reset.el
+++ b/lisp/magit-reset.el
@@ -34,15 +34,16 @@
(transient-define-prefix magit-reset ()
"Reset the `HEAD', index and/or worktree to a previous state."
:man-page "git-reset"
- ["Reset"
- ("m" "mixed (HEAD and index)" magit-reset-mixed)
- ("s" "soft (HEAD only)" magit-reset-soft)
- ("h" "hard (HEAD, index and files)" magit-reset-hard)
- ("k" "keep (HEAD and index, keeping uncommitted)" magit-reset-keep)
- ("i" "index (only)" magit-reset-index)
- ("w" "worktree (only)" magit-reset-worktree)
- ""
- ("f" "a file" magit-file-checkout)])
+ [["Reset"
+ ("b" "branch" magit-branch-reset)
+ ("f" "file" magit-file-checkout)]
+ ["Reset this"
+ ("m" "mixed (HEAD and index)" magit-reset-mixed)
+ ("s" "soft (HEAD only)" magit-reset-soft)
+ ("h" "hard (HEAD, index and worktree)" magit-reset-hard)
+ ("k" "keep (HEAD and index, keeping uncommitted)" magit-reset-keep)
+ ("i" "index (only)" magit-reset-index)
+ ("w" "worktree (only)" magit-reset-worktree)]])
;;;###autoload
(defun magit-reset-mixed (commit)