summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 97e9a22)
raw | patch | inline | side by side (parent: 97e9a22)
author | Sergei Organov <osv@javad.com> | |
Sat, 10 Nov 2007 13:17:33 +0000 (16:17 +0300) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 14 Nov 2007 09:59:12 +0000 (01:59 -0800) |
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>
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>
Documentation/core-tutorial.txt | patch | blob | history |
index 67064dd31ab1d5533ea1ccbba968b531765ee866..c126038c1f289c44e5e65bd03f797e11f3353333 100644 (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
--
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