diff options
| author | Sergei Organov <osv@javad.com> | 2007-11-10 14:17:33 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-14 10:59:12 +0100 |
| commit | 065c5ac1688ca5cde826dc87d9791c2eedec7026 (patch) | |
| tree | 5d62a2e7d8a8184b8de7202b4b422ed28d2f1174 | |
| parent | replace reference to git-rm with git-reset in git-commit doc (diff) | |
| download | git-065c5ac1688ca5cde826dc87d9791c2eedec7026.tar.xz git-065c5ac1688ca5cde826dc87d9791c2eedec7026.zip | |
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>
| -rw-r--r-- | Documentation/core-tutorial.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/core-tutorial.txt b/Documentation/core-tutorial.txt index 67064dd31a..c126038c1f 100644 --- a/Documentation/core-tutorial.txt +++ b/Documentation/core-tutorial.txt @@ -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 -- @@ -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 |