diff options
| author | Denton Liu <liu.denton@gmail.com> | 2020-05-05 13:00:59 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-05 23:07:30 (GMT) |
| commit | c5e786abe320f752ec9f5b0662bdaac2bc075212 (patch) | |
| tree | 985615b68c90eaab7fd30d2c6cd1992a4d034f4e /Documentation/git-merge.txt | |
| parent | b34789c0b0d3b137f0bb516b417bd8d75e0cb306 (diff) | |
| download | git-c5e786abe320f752ec9f5b0662bdaac2bc075212.zip git-c5e786abe320f752ec9f5b0662bdaac2bc075212.tar.gz git-c5e786abe320f752ec9f5b0662bdaac2bc075212.tar.bz2 | |
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>
Diffstat (limited to 'Documentation/git-merge.txt')
| -rw-r--r-- | Documentation/git-merge.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index ec06b2f..3819fad 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -106,12 +106,12 @@ commit or stash your changes before running 'git merge'. `MERGE_HEAD` is present unless `MERGE_AUTOSTASH` is also present in which case 'git merge --abort' applies the stash entry to the worktree whereas 'git reset --merge' will save the stashed changes in the stash -reflog. +list. --quit:: Forget about the current merge in progress. Leave the index 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:: After a 'git merge' stops due to conflicts you can conclude the |