{"thread":{"id":"16950","subject":"Subject: [PATCH] Documentation/git-merge: deprecated syntax moved to end","startedAt":"2009-01-01T18:41:52Z","lastAt":"2009-01-01T21:00:55Z","messageCount":2,"participants":["jidanni@jidanni.org","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"99093","messageId":"87bpuqvpfz.fsf@jidanni.org","threadId":"16950","inReplyTo":null,"subject":"Subject: [PATCH] Documentation/git-merge: deprecated syntax moved to end","fromName":"","fromEmail":"jidanni@jidanni.org","sentAt":"2009-01-01T18:41:52Z","receivedAt":"2009-01-01T18:41:52Z","isPatch":true,"sender":{"key":"jidanni@jidanni.org","avatar":"https://gravatar.com/avatar/36568d4af4c8d3e71627ef3b8c8d00e39065b12f29676cccd38ced75e68fa2a6?d=mp&s=160"},"body":"Moving the deprecated syntax moved to the end of the document.\nOr please at least stamp it *deprecated* in the SYNOPSIS, in case the\nuser reads no further down the page.\n\nSigned-off-by: jidanni <jidanni@jidanni.org>\n---\n Documentation/git-merge.txt |   12 ++++++------\n 1 files changed, 6 insertions(+), 6 deletions(-)\n\ndiff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt\nindex a3ac828..e619c9f 100644\n--- a/Documentation/git-merge.txt\n+++ b/Documentation/git-merge.txt\n@@ -11,18 +11,12 @@ SYNOPSIS\n [verse]\n 'git merge' [-n] [--stat] [--no-commit] [--squash] [-s <strategy>]...\n \t[-m <msg>] <remote>...\n-'git merge' <msg> HEAD <remote>...\n \n DESCRIPTION\n -----------\n This is the top-level interface to the merge machinery\n which drives multiple merge strategy scripts.\n \n-The second syntax (<msg> `HEAD` <remote>) is supported for\n-historical reasons.  Do not use it from the command line or in\n-new scripts.  It is the same as `git merge -m <msg> <remote>`.\n-\n-\n OPTIONS\n -------\n include::merge-options.txt[]\n@@ -211,6 +205,12 @@ You can work through the conflict with a number of tools:\n    common ancestor, 'git show :2:filename' shows the HEAD\n    version and 'git show :3:filename' shows the remote version.\n \n+DEPRECATED SYNTAX\n+-----------------\n+There also as a `git merge <msg> HEAD <remote>...` syntax supported\n+for historical reasons. Do not use it from the command line or in new\n+scripts. It is the same as `git merge -m <msg> <remote>`.\n+\n SEE ALSO\n --------\n linkgit:git-fmt-merge-msg[1], linkgit:git-pull[1],\n-- \n1.6.0.6\n"},{"id":"99113","messageId":"7vsko2hhbs.fsf@gitster.siamese.dyndns.org","threadId":"16950","inReplyTo":"87bpuqvpfz.fsf@jidanni.org","subject":"Re: Subject: [PATCH] Documentation/git-merge: deprecated syntax moved to end","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-01-01T21:00:55Z","receivedAt":"2009-01-01T21:00:55Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"jidanni@jidanni.org writes:\n\n> Moving the deprecated syntax moved to the end of the document.\n> Or please at least stamp it *deprecated* in the SYNOPSIS, in case the\n> user reads no further down the page.\n\nTo my mind, there is a difference between something being kept (and will\nbe kept for foreseeable future), and something being deprecated (and\neventual removal is at least contemplated).  The original merge syntax\nfalls into the first category, and the current description is correct and\nfine as-is.\n\nThe wording \"for historical reasons\" does not refer to the reason why the\nsecond syntax is still kept.  It merely refers to the reason why two\nsyntaxes exist in the first place.\n"}]}