# [PATCH] core-tutorial: Use new syntax for git-merge. 2 messages from 2007-10-30 to 2007-10-30. Participants: Sergei Organov, Junio C Hamano. Thread: https://gitlist.dev/t/10532 ## Sergei Organov, 2007-10-30 19:54 Subject: [PATCH] core-tutorial: Use new syntax for git-merge. Message-ID: <87lk9k4bvp.fsf@osv.gnss.ru> URL: https://gitlist.dev/e/87lk9k4bvp.fsf%40osv.gnss.ru ``` The patch below turns core-tutorial to use new syntax for git-merge. Please take close look at the last diff chunk, -- I'm not sure I got it right as it didn't have HEAD in the original version, -- was it already wrong before the patch? --- Documentation/core-tutorial.txt | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/core-tutorial.txt b/Documentation/core-tutorial.txt index d8e78ac..02255d8 100644 --- a/Documentation/core-tutorial.txt +++ b/Documentation/core-tutorial.txt @@ -878,7 +878,7 @@ script called `git merge`, which wants to know which branches you want to resolve and what the merge is all about: ------------ -$ git merge "Merge work in mybranch" HEAD mybranch +$ git merge -m "Merge work in mybranch" mybranch ------------ where the first argument is going to be used as the commit message if @@ -965,7 +965,7 @@ to the `master` branch. Let's go back to `mybranch`, and run ------------ $ git checkout mybranch -$ git merge "Merge upstream changes." HEAD master +$ git merge -m "Merge upstream changes." master ------------ This outputs something like this (the actual commit object names @@ -1607,8 +1607,8 @@ in both of them. You could merge in 'diff-fix' first and then 'commit-fix' next, like this: ------------ -$ git merge 'Merge fix in diff-fix' master diff-fix -$ git merge 'Merge fix in commit-fix' master commit-fix +$ git merge -m 'Merge fix in diff-fix' master diff-fix +$ git merge -m 'Merge fix in commit-fix' master commit-fix ------------ Which would result in: -- 1.5.3.4 ``` ## Junio C Hamano, 2007-10-30 20:05 Subject: Re: [PATCH] core-tutorial: Use new syntax for git-merge. Message-ID: <7v640ol667.fsf@gitster.siamese.dyndns.org> URL: https://gitlist.dev/e/7v640ol667.fsf%40gitster.siamese.dyndns.org In-Reply-To: <87lk9k4bvp.fsf@osv.gnss.ru> ``` Sergei Organov writes: > The patch below turns core-tutorial to use new syntax for > git-merge. Please take close look at the last diff chunk, -- I'm not sure I > got it right as it didn't have HEAD in the original version, -- was it already > wrong before the patch? You do not want the extra 'master' there. > @@ -1607,8 +1607,8 @@ in both of them. You could merge in 'diff-fix' first and then > 'commit-fix' next, like this: > > ------------ > -$ git merge 'Merge fix in diff-fix' master diff-fix > -$ git merge 'Merge fix in commit-fix' master commit-fix > +$ git merge -m 'Merge fix in diff-fix' master diff-fix > +$ git merge -m 'Merge fix in commit-fix' master commit-fix > ------------ The example is working on 'master' branch at this point and HEAD and 'master' are equivalent there. ```