Skip to content

Commit

Permalink
core-tutorial.txt: Fix argument mistake in an example.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Sergei Organov authored and Junio C Hamano committed Nov 14, 2007
1 parent 97e9a22 commit 065c5ac
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Documentation/core-tutorial.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1149,7 +1149,7 @@ back to the earlier repository with "hello" and "example" file,
and bring ourselves back to the pre-merge state:

------------
$ git show-branch --more=3 master mybranch
$ git show-branch --more=2 master mybranch
! [master] Merge work in mybranch
* [mybranch] Merge work in mybranch
--
Expand Down Expand Up @@ -1212,7 +1212,7 @@ $ git-read-tree -m -u $mb HEAD mybranch
This is the same `git-read-tree` command we have already seen,
but it takes three trees, unlike previous examples. This reads
the contents of each tree into different 'stage' in the index
file (the first tree goes to stage 1, the second stage 2,
file (the first tree goes to stage 1, the second to stage 2,
etc.). After reading three trees into three stages, the paths
that are the same in all three stages are 'collapsed' into stage
0. Also paths that are the same in two of three stages are
Expand Down

0 comments on commit 065c5ac

Please sign in to comment.