Commit 371b80c5 authored by Jonas Bernoulli's avatar Jonas Bernoulli

Rename magit-reset-head to magit-reset-mixed

This command also resets the index and it uses the `--mixed' argument.
parent 21f786a1
......@@ -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-293-g50e05e4ac+1)
#+SUBTITLE: for version 2.13.0 (2.13.0-294-g21f786a15+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-293-g50e05e4ac+1).
This manual is for Magit version 2.13.0 (2.13.0-294-g21f786a15+1).
#+BEGIN_QUOTE
Copyright (C) 2015-2018 Jonas Bernoulli <jonas@bernoul.li>
......@@ -5442,7 +5442,7 @@ Also see [[man:git-reset]]
defaulting to the commit at point. The working tree is kept as-is.
With a prefix argument also reset the working tree.
- Key: X m, magit-reset-head
- Key: X m, magit-reset-mixed
Reset the ~HEAD~ and index to some commit read from the user and
defaulting to the commit at point. The working tree is kept as-is.
......
......@@ -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-293-g50e05e4ac+1)
@subtitle for version 2.13.0 (2.13.0-294-g21f786a15+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-293-g50e05e4ac+1).
This manual is for Magit version 2.13.0 (2.13.0-294-g21f786a15+1).
@quotation
Copyright (C) 2015-2018 Jonas Bernoulli <jonas@@bernoul.li>
......@@ -7335,8 +7335,8 @@ defaulting to the commit at point. The working tree is kept as-is.
With a prefix argument also reset the working tree.
@kindex X m
@cindex magit-reset-head
@item @kbd{X m} @tie{}@tie{}@tie{}@tie{}(@code{magit-reset-head})
@cindex magit-reset-mixed
@item @kbd{X m} @tie{}@tie{}@tie{}@tie{}(@code{magit-reset-mixed})
Reset the @code{HEAD} and index to some commit read from the user and
defaulting to the commit at point. The working tree is kept as-is.
......
......@@ -522,7 +522,7 @@ which visits the thing at point using `browse-url'."
["Ignore" magit-gitignore t]
["Ignore locally" magit-gitignore-locally t]
["Discard" magit-discard t]
["Reset head" magit-reset-head t]
["Reset head and index" magit-reset-mixed t]
["Stash" magit-stash t]
["Snapshot" magit-snapshot t]
"---"
......
......@@ -29,5 +29,10 @@
(require 'magit)
;;; Obsolete since v2.90.0
(define-obsolete-function-alias 'magit-reset-head 'magit-reset-mixed "Magit 2.90.0")
;;; _
(provide 'magit-obsolete)
;;; magit-obsolete.el ends here
......@@ -33,7 +33,7 @@
(magit-define-popup magit-reset-popup
"Popup console for reset commands."
:man-page "git-reset"
:actions '((?m "reset mixed (HEAD and index)" magit-reset-head)
: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)
......@@ -56,7 +56,7 @@ With a prefix argument also reset the working tree.
(magit-reset-internal (if hard "--hard" "--mixed") commit))
;;;###autoload
(defun magit-reset-head (commit)
(defun magit-reset-mixed (commit)
"Reset the `HEAD' and index to COMMIT, but not the working tree.
\n(git reset --mixed COMMIT)"
(interactive (list (magit-reset-read-branch-or-commit "Reset %s to")))
......
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