Commit bd8a8946 authored by Jonas Bernoulli's avatar Jonas Bernoulli

Rename magit-reset to magit-reset-quickly

See #3619.
parent 55b79be8
......@@ -8,7 +8,7 @@
#+TEXINFO_DIR_CATEGORY: Emacs
#+TEXINFO_DIR_TITLE: Magit: (magit).
#+TEXINFO_DIR_DESC: Using Git from Emacs with Magit.
#+SUBTITLE: for version 2.13.0 (2.13.0-304-g4f48241fc+1)
#+SUBTITLE: for version 2.13.0 (2.13.0-305-g55b79be8f+1)
#+BIND: ox-texinfo+-before-export-hook ox-texinfo+-update-version-strings
#+TEXINFO_DEFFN: t
......@@ -23,7 +23,7 @@ directly from within Emacs. While many fine Git clients exist, only
Magit and Git itself deserve to be called porcelains.
#+TEXINFO: @noindent
This manual is for Magit version 2.13.0 (2.13.0-304-g4f48241fc+1).
This manual is for Magit version 2.13.0 (2.13.0-305-g55b79be8f+1).
#+BEGIN_QUOTE
Copyright (C) 2015-2018 Jonas Bernoulli <jonas@bernoul.li>
......@@ -5436,7 +5436,7 @@ features these commands instead.
Also see [[man:git-reset]]
- Key: x, magit-reset
- Key: x, magit-reset-quickly
Reset the ~HEAD~ and index to some commit read from the user and
defaulting to the commit at point, and possibly also reset the
......
......@@ -31,7 +31,7 @@ General Public License for more details.
@finalout
@titlepage
@title Magit User Manual
@subtitle for version 2.13.0 (2.13.0-304-g4f48241fc+1)
@subtitle for version 2.13.0 (2.13.0-305-g55b79be8f+1)
@author Jonas Bernoulli
@page
@vskip 0pt plus 1filll
......@@ -53,7 +53,7 @@ directly from within Emacs. While many fine Git clients exist, only
Magit and Git itself deserve to be called porcelains.
@noindent
This manual is for Magit version 2.13.0 (2.13.0-304-g4f48241fc+1).
This manual is for Magit version 2.13.0 (2.13.0-305-g55b79be8f+1).
@quotation
Copyright (C) 2015-2018 Jonas Bernoulli <jonas@@bernoul.li>
......@@ -7327,8 +7327,8 @@ the git-reset(1) manpage.
@table @asis
@kindex x
@cindex magit-reset
@item @kbd{x} @tie{}@tie{}@tie{}@tie{}(@code{magit-reset})
@cindex magit-reset-quickly
@item @kbd{x} @tie{}@tie{}@tie{}@tie{}(@code{magit-reset-quickly})
Reset the @code{HEAD} and index to some commit read from the user and
defaulting to the commit at point, and possibly also reset the
......
......@@ -441,7 +441,7 @@ starts complicating other things, then it will be removed."
(define-key map "V" 'magit-revert-popup)
(define-key map "w" 'magit-am-popup)
(define-key map "W" 'magit-patch-popup)
(define-key map "x" 'magit-reset)
(define-key map "x" 'magit-reset-quickly)
(define-key map "X" 'magit-reset-popup)
(define-key map "y" 'magit-show-refs-popup)
(define-key map "Y" 'magit-cherry)
......
......@@ -40,6 +40,7 @@
(define-obsolete-function-alias 'magit-rebase 'magit-rebase-branch "Magit 2.90.0")
(define-obsolete-function-alias 'magit-blame 'magit-blame-addition "Magit 2.90.0")
(define-obsolete-function-alias 'magit-revert 'magit-revert-and-commit "Magit 2.90.0")
(define-obsolete-function-alias 'magit-reset 'magit-reset-quickly "Magit 2.90.0")
;;; _
(provide 'magit-obsolete)
......
......@@ -43,7 +43,7 @@
:max-action-columns 1)
;;;###autoload
(defun magit-reset (commit &optional hard)
(defun magit-reset-quickly (commit &optional hard)
"Reset the `HEAD' and index to COMMIT, and possibly the working tree.
With a prefix argument reset the working tree otherwise don't.
\n(git reset --mixed|--hard COMMIT)"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment