core-tutorial: Use new syntax for git-merge.

"git-merge <msg> HEAD <other branches>" is still supported but
we shouldn't encourage its use.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/core-tutorial.txt b/Documentation/core-tutorial.txt
index 6b2590d0723ad94a45c9cae174935839df3331d8..df147b5e76879851a5a95f4ddb9695786f042d56 100644 (file)
--- a/Documentation/core-tutorial.txt
+++ b/Documentation/core-tutorial.txt
@@ -883,7 +883,7 @@ script called `git merge`, which wants to know which branches you want
 to resolve and what the merge is all about:
 
 ------------
 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
 ------------
 
 where the first argument is going to be used as the commit message if


@@ -970,7 +970,7 @@ to the `master` branch. Let's go back to `mybranch`, and run
 
 ------------
 $ git checkout mybranch
 
 ------------
 $ 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
 ------------
 
 This outputs something like this (the actual commit object names


@@ -1613,8 +1613,8 @@ in both of them.  You could merge in 'diff-fix' first and then
 'commit-fix' next, like this:
 
 ------------
 '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' diff-fix
+$ git merge -m 'Merge fix in commit-fix' commit-fix

 ------------
 
 Which would result in:
 ------------
 
 Which would result in: