summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8fcaca3)
raw | patch | inline | side by side (parent: 8fcaca3)
author | Michael J Gruber <git@drmicha.warpmail.net> | |
Mon, 15 Mar 2010 10:54:45 +0000 (11:54 +0100) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Mon, 15 Mar 2010 22:20:03 +0000 (15:20 -0700) |
Asciidoc takes the first non-space character in the first line of the
paragraph as a reference point for preformatted layout, so adjust to
that to make the table align.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
paragraph as a reference point for preformatted layout, so adjust to
that to make the table align.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-read-tree.txt | patch | blob | history |
index 567671c013589d10b04b2239062dec3b1f6cd787..5aaf0d5fde53624320e1b1b0d9aa4a4f3362f6a8 100644 (file)
I (index) H M Result
-------------------------------------------------------
- 0 nothing nothing nothing (does not happen)
- 1 nothing nothing exists use M
- 2 nothing exists nothing remove path from index
- 3 nothing exists exists, use M if "initial checkout"
+ 0 nothing nothing nothing (does not happen)
+ 1 nothing nothing exists use M
+ 2 nothing exists nothing remove path from index
+ 3 nothing exists exists, use M if "initial checkout"
H == M keep index otherwise
exists fail
H != M
clean I==H I==M
------------------
- 4 yes N/A N/A nothing nothing keep index
- 5 no N/A N/A nothing nothing keep index
+ 4 yes N/A N/A nothing nothing keep index
+ 5 no N/A N/A nothing nothing keep index
- 6 yes N/A yes nothing exists keep index
- 7 no N/A yes nothing exists keep index
- 8 yes N/A no nothing exists fail
- 9 no N/A no nothing exists fail
+ 6 yes N/A yes nothing exists keep index
+ 7 no N/A yes nothing exists keep index
+ 8 yes N/A no nothing exists fail
+ 9 no N/A no nothing exists fail
10 yes yes N/A exists nothing remove path from index
11 no yes N/A exists nothing fail