diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-14 14:37:18 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-14 14:37:18 +0300 |
| commit | fb5fd011482b5aa0b340a4a5bd9192c0efc1edb7 (patch) | |
| tree | 1701d97cd2ae3aa4ce52127cf8343b8b1efc9383 /Documentation/core-tutorial.txt | |
| parent | 481424e1f100de690849a9f0348fc78f45ab815e (diff) | |
| parent | b57321f57b324320bdcf9f453ec4788da166f8f4 (diff) | |
Merge branch 'maint'
* maint:
git-clean: honor core.excludesfile
Documentation: Fix man page breakage with DocBook XSL v1.72
git-remote.txt: fix typo
core-tutorial.txt: Fix argument mistake in an example.
replace reference to git-rm with git-reset in git-commit doc
Grammar fixes for gitattributes documentation
Don't allow fast-import tree delta chains to exceed maximum depth
revert/cherry-pick: allow starting from dirty work tree.
t/t3404: fix test for a bogus todo file.
Conflicts:
fast-import.c
Diffstat (limited to 'Documentation/core-tutorial.txt')
| -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 401d1deca0..bd6cd41245 100644 --- a/Documentation/core-tutorial.txt +++ b/Documentation/core-tutorial.txt @@ -1152,7 +1152,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 -- @@ -1215,7 +1215,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 |