summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-03-26 05:00:48 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-04-29 20:54:40 (GMT)
commitb4391657ed96c8dd2881d5c9fcad39a07d8cb92a (patch)
tree1f457683927dc54401f6e17bb5d7c79b65fa230e /Documentation/git-merge.txt
parentd45366e8aa922037e7e84c3f35924d2b1399a453 (diff)
downloadgit-b4391657ed96c8dd2881d5c9fcad39a07d8cb92a.zip
git-b4391657ed96c8dd2881d5c9fcad39a07d8cb92a.tar.gz
git-b4391657ed96c8dd2881d5c9fcad39a07d8cb92a.tar.bz2
merge: drop 'git merge <message> HEAD <commit>' syntax
And then if we and our users survived the previous "start warning if the old syntax is used" patch for a few years, we could apply this to actually drop the support for the ancient syntax. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
-rw-r--r--Documentation/git-merge.txt7
1 files changed, 1 insertions, 6 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index d9aa6b6..81a7f24 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -12,7 +12,6 @@ SYNOPSIS
'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]
[-s <strategy>] [-X <strategy-option>] [-S[<key-id>]]
[--[no-]rerere-autoupdate] [-m <msg>] [<commit>...]
-'git merge' <msg> HEAD <commit>...
'git merge' --abort
DESCRIPTION
@@ -44,11 +43,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