summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-03-30 21:07:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-03-30 21:07:13 (GMT)
commit1fdbfc443e9ef702df9a305231e15f020920c87a (patch)
tree0eb966f0e70b1a273ba873b93a5333b44eb28909 /Documentation/git-merge.txt
parente1104a5ee539408b81566066aaa6963cb87d5cd6 (diff)
parentb4391657ed96c8dd2881d5c9fcad39a07d8cb92a (diff)
downloadgit-1fdbfc443e9ef702df9a305231e15f020920c87a.zip
git-1fdbfc443e9ef702df9a305231e15f020920c87a.tar.gz
git-1fdbfc443e9ef702df9a305231e15f020920c87a.tar.bz2
Merge branch 'jc/merge-drop-old-syntax'
Stop supporting "git merge <message> HEAD <commit>" syntax that has been deprecated since October 2007, and issues a deprecation warning message since v2.5.0. * jc/merge-drop-old-syntax: merge: drop 'git merge <message> HEAD <commit>' syntax
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 ca3c27b..04fdd8c 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/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