Skip to content

Commit

Permalink
Documentation/git-read-tree: fix table layout
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Michael J Gruber authored and Junio C Hamano committed Mar 15, 2010
1 parent 8fcaca3 commit 71928f7
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions Documentation/git-read-tree.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,23 +164,23 @@ Here are the "carry forward" rules:

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
Expand Down

0 comments on commit 71928f7

Please sign in to comment.