Skip to content

Commit 065c5ac

Browse files
Sergei Organovgitster
authored andcommitted
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>
1 parent 97e9a22 commit 065c5ac

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Documentation/core-tutorial.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1149,7 +1149,7 @@ back to the earlier repository with "hello" and "example" file,
11491149
and bring ourselves back to the pre-merge state:
11501150

11511151
------------
1152-
$ git show-branch --more=3 master mybranch
1152+
$ git show-branch --more=2 master mybranch
11531153
! [master] Merge work in mybranch
11541154
* [mybranch] Merge work in mybranch
11551155
--
@@ -1212,7 +1212,7 @@ $ git-read-tree -m -u $mb HEAD mybranch
12121212
This is the same `git-read-tree` command we have already seen,
12131213
but it takes three trees, unlike previous examples. This reads
12141214
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,
12161216
etc.). After reading three trees into three stages, the paths
12171217
that are the same in all three stages are 'collapsed' into stage
12181218
0. Also paths that are the same in two of three stages are

0 commit comments

Comments
 (0)