diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-05-08 15:27:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-08 15:27:04 -0700 |
| commit | 2b43cff1c1e6418402997ad8a78ff0a401a5957a (patch) | |
| tree | d11eea5eb084d04a628671597a15e2df94d553c8 /git-merge.txt | |
| parent | dd4c178beaaa13be1f0211908f194c136b341973 (diff) | |
| download | git-htmldocs-2b43cff1c1e6418402997ad8a78ff0a401a5957a.tar.gz | |
Autogenerated HTML docs for v2.26.2-593-gb9946
Diffstat (limited to 'git-merge.txt')
| -rw-r--r-- | git-merge.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-merge.txt b/git-merge.txt index ec06b2f8c..3819fadac 100644 --- a/git-merge.txt +++ b/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 |