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 <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael J Gruber committed
Mar 15, 2010 at 11:54 UTC
71928f7f11355a25873b9693e9009acad31f40ef
1 file changed
+10
-10
Documentation/git-read-tree.txt
+10
-10
@@ -164,23 +164,23 @@ Here are the "carry forward" rules:
164
165
I (index) H M Result
166
-------------------------------------------------------
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"
171
H == M keep index otherwise
172
exists fail
173
H != M
174
175
clean I==H I==M
176
------------------
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
179
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
184
185
10 yes yes N/A exists nothing remove path from index
186
11 no yes N/A exists nothing fail