diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-06-13 20:19:41 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-06-13 20:19:41 (GMT) |
| commit | c4a38d161cbd3308825d7871d0f84f769aad04ab (patch) | |
| tree | 7c2ea40857b1242030eff1a3cc4548941a152def /Documentation | |
| parent | 89d1b573d73e7c93f2190a08ed9430f42104c10b (diff) | |
| parent | f3f8311ec76f9bcdc7e26a125e585eb4e473a8d2 (diff) | |
| download | git-c4a38d161cbd3308825d7871d0f84f769aad04ab.zip git-c4a38d161cbd3308825d7871d0f84f769aad04ab.tar.gz git-c4a38d161cbd3308825d7871d0f84f769aad04ab.tar.bz2 | |
Merge branch 'nd/merge-quit'
"git merge" learned "--quit" option that cleans up the in-progress
merge while leaving the working tree and the index still in a mess.
* nd/merge-quit:
merge: add --quit
merge: remove drop_save() in favor of remove_merge_branch_state()
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-merge.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 6294dbc..c01cfa6 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -100,6 +100,10 @@ commit or stash your changes before running 'git merge'. 'git merge --abort' is equivalent to 'git reset --merge' when `MERGE_HEAD` is present. +--quit:: + Forget about the current merge in progress. Leave the index + and the working tree as-is. + --continue:: After a 'git merge' stops due to conflicts you can conclude the merge by running 'git merge --continue' (see "HOW TO RESOLVE |