{"thread":{"id":"10532","subject":"[PATCH] core-tutorial: Use new syntax for git-merge.","startedAt":"2007-10-30T19:54:02Z","lastAt":"2007-10-30T20:05:20Z","messageCount":2,"participants":["Sergei Organov","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"57608","messageId":"87lk9k4bvp.fsf@osv.gnss.ru","threadId":"10532","inReplyTo":null,"subject":"[PATCH] core-tutorial: Use new syntax for git-merge.","fromName":"Sergei Organov","fromEmail":"osv@javad.com","sentAt":"2007-10-30T19:54:02Z","receivedAt":"2007-10-30T19:54:02Z","isPatch":true,"sender":{"key":"osv@javad.com","avatar":null},"body":"\nThe patch below turns core-tutorial to use new syntax for\ngit-merge. Please take close look at the last diff chunk, -- I'm not sure I\ngot it right as it didn't have HEAD in the original version, -- was it already\nwrong before the patch?\n\n---\n Documentation/core-tutorial.txt |    8 ++++----\n 1 files changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/core-tutorial.txt b/Documentation/core-tutorial.txt\nindex d8e78ac..02255d8 100644\n--- a/Documentation/core-tutorial.txt\n+++ b/Documentation/core-tutorial.txt\n@@ -878,7 +878,7 @@ script called `git merge`, which wants to know which branches you want\n to resolve and what the merge is all about:\n \n ------------\n-$ git merge \"Merge work in mybranch\" HEAD mybranch\n+$ git merge -m \"Merge work in mybranch\" mybranch\n ------------\n \n where the first argument is going to be used as the commit message if\n@@ -965,7 +965,7 @@ to the `master` branch. Let's go back to `mybranch`, and run\n \n ------------\n $ git checkout mybranch\n-$ git merge \"Merge upstream changes.\" HEAD master\n+$ git merge -m \"Merge upstream changes.\" master\n ------------\n \n This outputs something like this (the actual commit object names\n@@ -1607,8 +1607,8 @@ in both of them.  You could merge in 'diff-fix' first and then\n 'commit-fix' next, like this:\n \n ------------\n-$ git merge 'Merge fix in diff-fix' master diff-fix\n-$ git merge 'Merge fix in commit-fix' master commit-fix\n+$ git merge -m 'Merge fix in diff-fix' master diff-fix\n+$ git merge -m 'Merge fix in commit-fix' master commit-fix\n ------------\n \n Which would result in:\n-- \n1.5.3.4\n"},{"id":"57611","messageId":"7v640ol667.fsf@gitster.siamese.dyndns.org","threadId":"10532","inReplyTo":"87lk9k4bvp.fsf@osv.gnss.ru","subject":"Re: [PATCH] core-tutorial: Use new syntax for git-merge.","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2007-10-30T20:05:20Z","receivedAt":"2007-10-30T20:05:20Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Sergei Organov <osv@javad.com> writes:\n\n> The patch below turns core-tutorial to use new syntax for\n> git-merge. Please take close look at the last diff chunk, -- I'm not sure I\n> got it right as it didn't have HEAD in the original version, -- was it already\n> wrong before the patch?\n\nYou do not want the extra 'master' there.\n\n> @@ -1607,8 +1607,8 @@ in both of them.  You could merge in 'diff-fix' first and then\n>  'commit-fix' next, like this:\n>  \n>  ------------\n> -$ git merge 'Merge fix in diff-fix' master diff-fix\n> -$ git merge 'Merge fix in commit-fix' master commit-fix\n> +$ git merge -m 'Merge fix in diff-fix' master diff-fix\n> +$ git merge -m 'Merge fix in commit-fix' master commit-fix\n>  ------------\n\nThe example is working on 'master' branch at this point and HEAD\nand 'master' are equivalent there.\n"}]}