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>
Sergei Organov committed
Oct 30, 2007 at 22:54 UTC
ba17892ddc85c0ffe8fecd600c29cb38ec7e5587
1 file changed
+4
-4
Documentation/core-tutorial.txt
+4
-4
@@ -883,7 +883,7 @@ script called `git merge`, which wants to know which branches you want
883
to resolve and what the merge is all about:
884
885
------------
886
-$ git merge "Merge work in mybranch" HEAD mybranch
886
+$ git merge -m "Merge work in mybranch" mybranch
887
------------
888
889
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
970
971
------------
972
$ git checkout mybranch
973
-$ git merge "Merge upstream changes." HEAD master
973
+$ git merge -m "Merge upstream changes." master
974
------------
975
976
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
1613
'commit-fix' next, like this:
1614
1615
------------
1616
-$ git merge 'Merge fix in diff-fix' master diff-fix
1617
-$ git merge 'Merge fix in commit-fix' master commit-fix
1616
+$ git merge -m 'Merge fix in diff-fix' diff-fix
1617
+$ git merge -m 'Merge fix in commit-fix' commit-fix
1618
------------
1619
1620
Which would result in: