Skip to content

Commit 71928f7

Browse files
Michael J Grubergitster
authored andcommitted
Documentation/git-read-tree: fix table layout
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 8fcaca3 commit 71928f7

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

Documentation/git-read-tree.txt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -164,23 +164,23 @@ Here are the "carry forward" rules:
164164

165165
I (index) H M Result
166166
-------------------------------------------------------
167-
0 nothing nothing nothing (does not happen)
168-
1 nothing nothing exists use M
169-
2 nothing exists nothing remove path from index
170-
3 nothing exists exists, use M if "initial checkout"
167+
0 nothing nothing nothing (does not happen)
168+
1 nothing nothing exists use M
169+
2 nothing exists nothing remove path from index
170+
3 nothing exists exists, use M if "initial checkout"
171171
H == M keep index otherwise
172172
exists fail
173173
H != M
174174

175175
clean I==H I==M
176176
------------------
177-
4 yes N/A N/A nothing nothing keep index
178-
5 no N/A N/A nothing nothing keep index
177+
4 yes N/A N/A nothing nothing keep index
178+
5 no N/A N/A nothing nothing keep index
179179

180-
6 yes N/A yes nothing exists keep index
181-
7 no N/A yes nothing exists keep index
182-
8 yes N/A no nothing exists fail
183-
9 no N/A no nothing exists fail
180+
6 yes N/A yes nothing exists keep index
181+
7 no N/A yes nothing exists keep index
182+
8 yes N/A no nothing exists fail
183+
9 no N/A no nothing exists fail
184184

185185
10 yes yes N/A exists nothing remove path from index
186186
11 no yes N/A exists nothing fail

0 commit comments

Comments
 (0)