diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-05-08 14:25:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-08 14:25:09 -0700 |
| commit | 6381c301ff5ae2c4f21f079fa4c8550667330a24 (patch) | |
| tree | 62ae9c84a787f63ad6b6572843c126ab2d80d2f9 /Documentation/git-merge.txt | |
| parent | Merge branch 'cb/avoid-colliding-with-netbsd-hmac' (diff) | |
| parent | Doc: reference the "stash list" in autostash docs (diff) | |
| download | tgif-6381c301ff5ae2c4f21f079fa4c8550667330a24.tar.xz | |
Merge branch 'dl/doc-stash-remove-mention-of-reflog'
Doc update.
* dl/doc-stash-remove-mention-of-reflog:
Doc: reference the "stash list" in autostash docs
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 ec06b2f8c2..3819fadac1 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 |