From: jidanni@jidanni.org Date: Thu, 01 Jan 2009 18:41:52 GMT Subject: Subject: [PATCH] Documentation/git-merge: deprecated syntax moved to end Message-ID: <87bpuqvpfz.fsf@jidanni.org> Moving the deprecated syntax moved to the end of the document. Or please at least stamp it *deprecated* in the SYNOPSIS, in case the user reads no further down the page. Signed-off-by: jidanni --- Documentation/git-merge.txt | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index a3ac828..e619c9f 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -11,18 +11,12 @@ SYNOPSIS [verse] 'git merge' [-n] [--stat] [--no-commit] [--squash] [-s ]... [-m ] ... -'git merge' HEAD ... DESCRIPTION ----------- This is the top-level interface to the merge machinery which drives multiple merge strategy scripts. -The second syntax ( `HEAD` ) 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 `. - - OPTIONS ------- include::merge-options.txt[] @@ -211,6 +205,12 @@ You can work through the conflict with a number of tools: common ancestor, 'git show :2:filename' shows the HEAD version and 'git show :3:filename' shows the remote version. +DEPRECATED SYNTAX +----------------- +There also as a `git merge HEAD ...` syntax supported +for historical reasons. Do not use it from the command line or in new +scripts. It is the same as `git merge -m `. + SEE ALSO -------- linkgit:git-fmt-merge-msg[1], linkgit:git-pull[1], -- 1.6.0.6