diff options
| author | Jonas Bernoulli <jonas@bernoul.li> | 2018-10-15 11:48:00 +0200 |
|---|---|---|
| committer | Jonas Bernoulli <jonas@bernoul.li> | 2019-02-03 01:26:00 +0100 |
| commit | 90b1bd6c43d96b0fc1d18154d3f0cdb0524c506e (patch) | |
| tree | 988118da0314cfbd5a42336c71eafb252d6a05f6 /lisp/magit-reset.el | |
| parent | 4ec193926fcc9ce9b374a411733168399e7121f2 (diff) | |
Define magit-reset as a transient command
Diffstat (limited to 'lisp/magit-reset.el')
| -rw-r--r-- | lisp/magit-reset.el | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lisp/magit-reset.el b/lisp/magit-reset.el index 063c86c..eb71f3b 100644 --- a/lisp/magit-reset.el +++ b/lisp/magit-reset.el @@ -29,18 +29,18 @@ (require 'magit) -;;;###autoload (autoload 'magit-reset-popup "magit" nil t) -(magit-define-popup magit-reset-popup - "Popup console for reset commands." +;;;###autoload (autoload 'magit-reset "magit" nil t) +(define-transient-command magit-reset () + "Reset the `HEAD', index and/or worktree to a previous state." :man-page "git-reset" - :actions '((?m "reset mixed (HEAD and index)" magit-reset-mixed) - (?s "reset soft (HEAD only)" magit-reset-soft) - (?h "reset hard (HEAD, index, and files)" magit-reset-hard) - (?i "reset index (only)" magit-reset-index) - (?w "reset worktree (only)" magit-reset-worktree) - nil - (?f "reset a file" magit-file-checkout)) - :max-action-columns 1) + ["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) + ("i" "index (only)" magit-reset-index) + ("w" "worktree (only)" magit-reset-worktree) + ?\n + ("f" "a file" magit-file-checkout)]) ;;;###autoload (defun magit-reset-mixed (commit) |