Commit 55b79be8 authored by Jonas Bernoulli's avatar Jonas Bernoulli

Rename magit-revert to magit-revert-and-commit

See #3619.
parent 4f48241f
......@@ -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-303-g51f946f24+1)
#+SUBTITLE: for version 2.13.0 (2.13.0-304-g4f48241fc+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-303-g51f946f24+1).
This manual is for Magit version 2.13.0 (2.13.0-304-g4f48241fc+1).
#+BEGIN_QUOTE
Copyright (C) 2015-2018 Jonas Bernoulli <jonas@bernoul.li>
......@@ -5403,7 +5403,7 @@ features these commands instead.
When no cherry-pick or revert is in progress, then the popup buffer
features the following commands.
- Key: V V, magit-revert
- Key: V V, magit-revert-and-commit
Revert a commit by creating a new commit. Prompt for a commit,
defaulting to the commit at point. If the region selects multiple
......
......@@ -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-303-g51f946f24+1)
@subtitle for version 2.13.0 (2.13.0-304-g4f48241fc+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-303-g51f946f24+1).
This manual is for Magit version 2.13.0 (2.13.0-304-g4f48241fc+1).
@quotation
Copyright (C) 2015-2018 Jonas Bernoulli <jonas@@bernoul.li>
......@@ -7268,8 +7268,8 @@ features the following commands.
@table @asis
@kindex V V
@cindex magit-revert
@item @kbd{V V} @tie{}@tie{}@tie{}@tie{}(@code{magit-revert})
@cindex magit-revert-and-commit
@item @kbd{V V} @tie{}@tie{}@tie{}@tie{}(@code{magit-revert-and-commit})
Revert a commit by creating a new commit. Prompt for a commit,
defaulting to the commit at point. If the region selects multiple
......
......@@ -39,6 +39,7 @@
(define-obsolete-function-alias 'magit-pull 'magit-pull-branch "Magit 2.90.0")
(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")
;;; _
(provide 'magit-obsolete)
......
......@@ -335,7 +335,7 @@ the process manually."
:options '((?s "Strategy" "--strategy=")
(?S "Sign using gpg" "--gpg-sign=" magit-read-gpg-secret-key)
(?m "Replay merge relative to parent" "--mainline="))
:actions '((?V "Revert commit(s)" magit-revert)
:actions '((?V "Revert commit(s)" magit-revert-and-commit)
(?v "Revert changes" magit-revert-no-commit))
:sequence-actions '((?V "Continue" magit-sequencer-continue)
(?s "Skip" magit-sequencer-skip)
......@@ -349,7 +349,7 @@ the process manually."
(magit-revert-arguments)))
;;;###autoload
(defun magit-revert (commit &optional args)
(defun magit-revert-and-commit (commit &optional args)
"Revert COMMIT by creating a new commit.
Prompt for a commit, defaulting to the commit at point. If
the region selects multiple commits, then revert all of them,
......
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