{"thread":{"id":"48703","subject":"[PATCH] doc: update the order of the syntax `git merge --continue`","startedAt":"2018-06-13T03:57:26Z","lastAt":"2018-06-14T01:36:11Z","messageCount":3,"participants":["Meng-Sung Wu","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"350045","messageId":"20180613035702.15957-1-mengsungwu@fortunewhite.org","threadId":"48703","inReplyTo":null,"subject":"[PATCH] doc: update the order of the syntax `git merge --continue`","fromName":"Meng-Sung Wu","fromEmail":"mengsungwu@fortunewhite.org","sentAt":"2018-06-13T03:57:02Z","receivedAt":"2018-06-13T03:57:26Z","isPatch":true,"sender":{"key":"mengsungwu@fortunewhite.org","avatar":null},"body":"The syntax \"git merge <message> HEAD <commit>\" has been removed. The\norder of the syntax should also be updated.\n---\n Documentation/git-merge.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt\nindex d5dfd8430..6a5c00e2c 100644\n--- a/Documentation/git-merge.txt\n+++ b/Documentation/git-merge.txt\n@@ -57,7 +57,7 @@ reconstruct the original (pre-merge) changes. Therefore:\n discouraged: while possible, it may leave you in a state that is hard to\n back out of in the case of a conflict.\n \n-The fourth syntax (\"`git merge --continue`\") can only be run after the\n+The third syntax (\"`git merge --continue`\") can only be run after the\n merge has resulted in conflicts.\n \n OPTIONS\n-- \n2.15.1 (Apple Git-101)\n\n"},{"id":"350074","messageId":"xmqq36xq7dix.fsf@gitster-ct.c.googlers.com","threadId":"48703","inReplyTo":"20180613035702.15957-1-mengsungwu@fortunewhite.org","subject":"Re: [PATCH] doc: update the order of the syntax `git merge --continue`","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-06-13T18:21:58Z","receivedAt":"2018-06-13T18:22:04Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Meng-Sung Wu <mengsungwu@fortunewhite.org> writes:\n\n> The syntax \"git merge <message> HEAD <commit>\" has been removed. The\n> order of the syntax should also be updated.\n> ---\n>  Documentation/git-merge.txt | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n\nAn obviously good change.  Could you please sign-off your patch?\n\ncf. https://git.github.io/htmldocs/SubmittingPatches.html#sign-off\n\n\n\n> diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt\n> index d5dfd8430..6a5c00e2c 100644\n> --- a/Documentation/git-merge.txt\n> +++ b/Documentation/git-merge.txt\n> @@ -57,7 +57,7 @@ reconstruct the original (pre-merge) changes. Therefore:\n>  discouraged: while possible, it may leave you in a state that is hard to\n>  back out of in the case of a conflict.\n>  \n> -The fourth syntax (\"`git merge --continue`\") can only be run after the\n> +The third syntax (\"`git merge --continue`\") can only be run after the\n>  merge has resulted in conflicts.\n>  \n>  OPTIONS\n"},{"id":"350138","messageId":"20180614013334.17145-1-mengsungwu@fortunewhite.org","threadId":"48703","inReplyTo":"xmqq36xq7dix.fsf@gitster-ct.c.googlers.com","subject":"[PATCH v2] doc: update the order of the syntax `git merge --continue`","fromName":"Meng-Sung Wu","fromEmail":"mengsungwu@fortunewhite.org","sentAt":"2018-06-14T01:33:34Z","receivedAt":"2018-06-14T01:36:11Z","isPatch":true,"sender":{"key":"mengsungwu@fortunewhite.org","avatar":null},"body":"The syntax \"git merge <message> HEAD <commit>\" has been removed. The\norder of the syntax should also be updated.\n\nSigned-off-by: Meng-Sung Wu <mengsungwu@fortunewhite.org>\n---\n Documentation/git-merge.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt\nindex d5dfd8430..6a5c00e2c 100644\n--- a/Documentation/git-merge.txt\n+++ b/Documentation/git-merge.txt\n@@ -57,7 +57,7 @@ reconstruct the original (pre-merge) changes. Therefore:\n discouraged: while possible, it may leave you in a state that is hard to\n back out of in the case of a conflict.\n \n-The fourth syntax (\"`git merge --continue`\") can only be run after the\n+The third syntax (\"`git merge --continue`\") can only be run after the\n merge has resulted in conflicts.\n \n OPTIONS\n-- \n2.15.1 (Apple Git-101)\n\n"}]}