Skip to content

Commit 1ba75ff

Browse files
committed
Merge branch 'jk/doc-read-tree-table-asciidoctor-fix'
A docfix. * jk/doc-read-tree-table-asciidoctor-fix: doc: put literal block delimiter around table
2 parents 376a1da + c08fd63 commit 1ba75ff

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

Documentation/git-read-tree.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ Here are the "carry forward" rules, where "I" denotes the index,
179179
"clean" means that index and work tree coincide, and "exists"/"nothing"
180180
refer to the presence of a path in the specified commit:
181181

182+
....
182183
I H M Result
183184
-------------------------------------------------------
184185
0 nothing nothing nothing (does not happen)
@@ -217,6 +218,7 @@ refer to the presence of a path in the specified commit:
217218
19 no no yes exists exists keep index
218219
20 yes yes no exists exists use M
219220
21 no yes no exists exists fail
221+
....
220222

221223
In all "keep index" cases, the index entry stays as in the
222224
original index file. If the entry is not up to date,

0 commit comments

Comments
 (0)