diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-06-13 15:09:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-06-13 15:09:30 -0700 |
| commit | 5193787ca4fbec1fbd47afd14701cc8a3799641e (patch) | |
| tree | 12a9d0bb43ba929ff7c759dd2ee8c94b0a73a1e2 /git-merge.txt | |
| parent | 1c05a66ac9af54d408b3d97e791622cbdcf7d8f1 (diff) | |
| download | git-htmldocs-5193787ca4fbec1fbd47afd14701cc8a3799641e.tar.gz | |
Autogenerated HTML docs for v2.22.0-68-g0aae9
Diffstat (limited to 'git-merge.txt')
| -rw-r--r-- | git-merge.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/git-merge.txt b/git-merge.txt index 6294dbc09..c01cfa659 100644 --- a/git-merge.txt +++ b/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 |