Skip to content

Commit c5e786a

Browse files
Denton-Lgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent b34789c commit c5e786a

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Documentation/git-merge.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,12 @@ commit or stash your changes before running 'git merge'.
106106
`MERGE_HEAD` is present unless `MERGE_AUTOSTASH` is also present in
107107
which case 'git merge --abort' applies the stash entry to the worktree
108108
whereas 'git reset --merge' will save the stashed changes in the stash
109-
reflog.
109+
list.
110110

111111
--quit::
112112
Forget about the current merge in progress. Leave the index
113113
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.
115115

116116
--continue::
117117
After a 'git merge' stops due to conflicts you can conclude the

Documentation/git-rebase.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ See also INCOMPATIBLE OPTIONS below.
257257
Abort the rebase operation but HEAD is not reset back to the
258258
original branch. The index and working tree are also left
259259
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.
261261

262262
--apply:
263263
Use applying strategies to rebase (calling `git-am`

0 commit comments

Comments
 (0)