mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Doc: reference the "stash list" in autostash docs
In documentation pertaining to autostash behavior, we refer to the "stash reflog". This description is too low-level as the reflog refers to an implementation detail of how the stash works and, for end-users, they do not need to be aware of this at all. Change references of "stash reflog" to "stash list", which should provide more accessible terminology for end-users. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
b34789c0b0
commit
c5e786abe3
|
@ -106,12 +106,12 @@ commit or stash your changes before running 'git merge'.
|
||||||
`MERGE_HEAD` is present unless `MERGE_AUTOSTASH` is also present in
|
`MERGE_HEAD` is present unless `MERGE_AUTOSTASH` is also present in
|
||||||
which case 'git merge --abort' applies the stash entry to the worktree
|
which case 'git merge --abort' applies the stash entry to the worktree
|
||||||
whereas 'git reset --merge' will save the stashed changes in the stash
|
whereas 'git reset --merge' will save the stashed changes in the stash
|
||||||
reflog.
|
list.
|
||||||
|
|
||||||
--quit::
|
--quit::
|
||||||
Forget about the current merge in progress. Leave the index
|
Forget about the current merge in progress. Leave the index
|
||||||
and the working tree as-is. If `MERGE_AUTOSTASH` is present, the
|
and the working tree as-is. If `MERGE_AUTOSTASH` is present, the
|
||||||
stash entry will be saved to the stash reflog.
|
stash entry will be saved to the stash list.
|
||||||
|
|
||||||
--continue::
|
--continue::
|
||||||
After a 'git merge' stops due to conflicts you can conclude the
|
After a 'git merge' stops due to conflicts you can conclude the
|
||||||
|
|
|
@ -257,7 +257,7 @@ See also INCOMPATIBLE OPTIONS below.
|
||||||
Abort the rebase operation but HEAD is not reset back to the
|
Abort the rebase operation but HEAD is not reset back to the
|
||||||
original branch. The index and working tree are also left
|
original branch. The index and working tree are also left
|
||||||
unchanged as a result. If a temporary stash entry was created
|
unchanged as a result. If a temporary stash entry was created
|
||||||
using --autostash, it will be saved to the stash reflog.
|
using --autostash, it will be saved to the stash list.
|
||||||
|
|
||||||
--apply:
|
--apply:
|
||||||
Use applying strategies to rebase (calling `git-am`
|
Use applying strategies to rebase (calling `git-am`
|
||||||
|
|
Loading…
Reference in a new issue