diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2019-05-18 18:30:43 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-19 10:47:40 +0900 |
| commit | f3f8311ec76f9bcdc7e26a125e585eb4e473a8d2 (patch) | |
| tree | caa84e1112e300a06e7361ed03624e3c8a0f804f /Documentation/git-merge.txt | |
| parent | b64335554a3691cbc134fb73a598dfd593f44b4e (diff) | |
| download | git-f3f8311ec76f9bcdc7e26a125e585eb4e473a8d2.tar.gz | |
merge: add --quit
This allows to cancel the current merge without resetting worktree/index,
which is what --abort is for. Like other --quit(s), this is often used
when you forgot that you're in the middle of a merge and already
switched away, doing different things. By the time you've realized, you
can't even continue the merge anymore.
This also makes all in-progress commands, am, merge, rebase, revert and
cherry-pick, take all three --abort, --continue and --quit (bisect has a
different UI).
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@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, 4 insertions, 0 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 4cc86469f3..b7d581fc76 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -99,6 +99,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 |