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>
Denton Liu committed
May 5, 2020 at 09:00 UTC
c5e786abe320f752ec9f5b0662bdaac2bc075212
2 files changed
+3
-3
Documentation/git-merge.txt
+2
-2
@@ -106,12 +106,12 @@ commit or stash your changes before running 'git merge'.
106
`MERGE_HEAD` is present unless `MERGE_AUTOSTASH` is also present in
107
which case 'git merge --abort' applies the stash entry to the worktree
108
whereas 'git reset --merge' will save the stashed changes in the stash
109
-reflog.
109
+list.
110
111
--quit::
112
Forget about the current merge in progress. Leave the index
113
and the working tree as-is. If `MERGE_AUTOSTASH` is present, the
114
- stash entry will be saved to the stash reflog.
114
+ stash entry will be saved to the stash list.
115
116
--continue::
117
After a 'git merge' stops due to conflicts you can conclude the
Documentation/git-rebase.txt
+1
-1
@@ -257,7 +257,7 @@ See also INCOMPATIBLE OPTIONS below.
257
Abort the rebase operation but HEAD is not reset back to the
258
original branch. The index and working tree are also left
259
unchanged as a result. If a temporary stash entry was created
260
- using --autostash, it will be saved to the stash reflog.
260
+ using --autostash, it will be saved to the stash list.
261
262
--apply:
263
Use applying strategies to rebase (calling `git-am`