core-tutorial.txt: Fix argument mistake in an example.
One of examples has wrong output given the arguments provided. Fix arguments to match the output. Fix a minor syntax mistake in another place. Signed-off-by: Sergei Organov <osv@javad.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sergei Organov committed
Nov 10, 2007 at 16:17 UTC
065c5ac1688ca5cde826dc87d9791c2eedec7026
1 file changed
+2
-2
Documentation/core-tutorial.txt
+2
-2
@@ -1149,7 +1149,7 @@ back to the earlier repository with "hello" and "example" file,
1149
and bring ourselves back to the pre-merge state:
1150
1151
------------
1152
-$ git show-branch --more=3 master mybranch
1152
+$ git show-branch --more=2 master mybranch
1153
! [master] Merge work in mybranch
1154
* [mybranch] Merge work in mybranch
1155
--
@@ -1212,7 +1212,7 @@ $ git-read-tree -m -u $mb HEAD mybranch
1212
This is the same `git-read-tree` command we have already seen,
1213
but it takes three trees, unlike previous examples. This reads
1214
the contents of each tree into different 'stage' in the index
1215
-file (the first tree goes to stage 1, the second stage 2,
1215
+file (the first tree goes to stage 1, the second to stage 2,
1216
etc.). After reading three trees into three stages, the paths
1217
that are the same in all three stages are 'collapsed' into stage
1218
0. Also paths that are the same in two of three stages are