diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-03-30 16:00:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-30 16:00:21 -0700 |
| commit | dc8d0c30582dfb0c734e0999ffbb301067de92ef (patch) | |
| tree | cf4262bb682df7b39006e1f33554dd9804623144 /git-merge.txt | |
| parent | 2affb96f40129de19a00a0ff8b22e31a47499c42 (diff) | |
| download | git-htmldocs-dc8d0c30582dfb0c734e0999ffbb301067de92ef.tar.gz | |
Autogenerated HTML docs for v2.12.2-575-gb14f2
Diffstat (limited to 'git-merge.txt')
| -rw-r--r-- | git-merge.txt | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/git-merge.txt b/git-merge.txt index ca3c27b88..04fdd8cf0 100644 --- a/git-merge.txt +++ b/git-merge.txt @@ -13,7 +13,6 @@ SYNOPSIS [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]] [--[no-]allow-unrelated-histories] [--[no-]rerere-autoupdate] [-m <msg>] [<commit>...] -'git merge' <msg> HEAD <commit>... 'git merge' --abort 'git merge' --continue @@ -46,11 +45,7 @@ a log message from the user describing the changes. D---E---F---G---H master ------------ -The second syntax (<msg> `HEAD` <commit>...) is supported for -historical reasons. Do not use it from the command line or in -new scripts. It is the same as `git merge -m <msg> <commit>...`. - -The third syntax ("`git merge --abort`") can only be run after the +The second syntax ("`git merge --abort`") can only be run after the merge has resulted in conflicts. 'git merge --abort' will abort the merge process and try to reconstruct the pre-merge state. However, if there were uncommitted changes when the merge started (and |