Commit 81d38b7b authored by Jonas Bernoulli's avatar Jonas Bernoulli

Rename magit-{stash,snapshot} to magit-{stash,snapshot}-both

`magit-snapshot' doesn't conflict with the name of a future
transient command, but for consistency it should be renamed too.

See #3619.
parent 728052be
......@@ -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-307-g822e762cd+1)
#+SUBTITLE: for version 2.13.0 (2.13.0-308-g728052be4+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-307-g822e762cd+1).
This manual is for Magit version 2.13.0 (2.13.0-308-g728052be4+1).
#+BEGIN_QUOTE
Copyright (C) 2015-2018 Jonas Bernoulli <jonas@bernoul.li>
......@@ -5485,7 +5485,7 @@ Also see [[man:git-stash]]
This prefix command shows the following suffix commands along with
the appropriate infix arguments in a popup buffer.
- Key: z z, magit-stash
- Key: z z, magit-stash-both
Create a stash of the index and working tree. Untracked files are
included according to popup arguments. One prefix argument is
......@@ -5511,7 +5511,7 @@ Also see [[man:git-stash]]
prefix argument is equivalent to ~--include-untracked~ while two
prefix arguments are equivalent to ~--all~.
- Key: z Z, magit-snapshot
- Key: z Z, magit-snapshot-both
Create a snapshot of the index and working tree. Untracked files
are included according to popup arguments. One prefix argument 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-307-g822e762cd+1)
@subtitle for version 2.13.0 (2.13.0-308-g728052be4+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-307-g822e762cd+1).
This manual is for Magit version 2.13.0 (2.13.0-308-g728052be4+1).
@quotation
Copyright (C) 2015-2018 Jonas Bernoulli <jonas@@bernoul.li>
......@@ -7406,8 +7406,8 @@ This prefix command shows the following suffix commands along with
the appropriate infix arguments in a popup buffer.
@kindex z z
@cindex magit-stash
@item @kbd{z z} @tie{}@tie{}@tie{}@tie{}(@code{magit-stash})
@cindex magit-stash-both
@item @kbd{z z} @tie{}@tie{}@tie{}@tie{}(@code{magit-stash-both})
Create a stash of the index and working tree. Untracked files are
included according to popup arguments. One prefix argument is
......@@ -7440,8 +7440,8 @@ prefix argument is equivalent to @code{--include-untracked} while two
prefix arguments are equivalent to @code{--all}.
@kindex z Z
@cindex magit-snapshot
@item @kbd{z Z} @tie{}@tie{}@tie{}@tie{}(@code{magit-snapshot})
@cindex magit-snapshot-both
@item @kbd{z Z} @tie{}@tie{}@tie{}@tie{}(@code{magit-snapshot-both})
Create a snapshot of the index and working tree. Untracked files
are included according to popup arguments. One prefix argument is
......
......@@ -523,8 +523,8 @@ which visits the thing at point using `browse-url'."
["Ignore locally" magit-gitignore-locally t]
["Discard" magit-discard t]
["Reset head and index" magit-reset-mixed t]
["Stash" magit-stash t]
["Snapshot" magit-snapshot t]
["Stash" magit-stash-both t]
["Snapshot" magit-snapshot-both t]
"---"
["Branch..." magit-checkout t]
["Merge" magit-merge t]
......
......@@ -42,6 +42,8 @@
(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")
(define-obsolete-function-alias 'magit-merge 'magit-merge-plain "Magit 2.90.0")
(define-obsolete-function-alias 'magit-stash 'magit-stash-both "Magit 2.90.0")
(define-obsolete-function-alias 'magit-snapshot 'magit-snapshot-both "Magit 2.90.0")
;;; _
(provide 'magit-obsolete)
......
......@@ -87,8 +87,8 @@ AUTHOR-WIDTH has to be an integer. When the name of the author
:man-page "git-stash"
:switches '((?u "Also save untracked files" "--include-untracked")
(?a "Also save untracked and ignored files" "--all"))
:actions '((?z "Save" magit-stash)
(?Z "Snapshot" magit-snapshot)
:actions '((?z "Save" magit-stash-both)
(?Z "Snapshot" magit-snapshot-both)
(?p "Pop" magit-stash-pop)
(?i "Save index" magit-stash-index)
(?I "Snapshot index" magit-snapshot-index)
......@@ -107,7 +107,7 @@ AUTHOR-WIDTH has to be an integer. When the name of the author
:max-action-columns 3)
;;;###autoload
(defun magit-stash (message &optional include-untracked)
(defun magit-stash-both (message &optional include-untracked)
"Create a stash of the index and working tree.
Untracked files are included according to popup arguments.
One prefix argument is equivalent to `--include-untracked'
......@@ -162,7 +162,7 @@ while two prefix arguments are equivalent to `--all'."
input)))
;;;###autoload
(defun magit-snapshot (&optional include-untracked)
(defun magit-snapshot-both (&optional include-untracked)
"Create a snapshot of the index and working tree.
Untracked files are included according to popup arguments.
One prefix argument is equivalent to `--include-untracked'
......
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