development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 11:39:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jk/doc-read-tree-table-asciidoctor-fix' into maint

Browse source 
A docfix.

* jk/doc-read-tree-table-asciidoctor-fix:
  doc: put literal block delimiter around table
This commit is contained in:
Junio C Hamano 2017-10-18 14:19:11 +09:00
parent 9554e71f60 c08fd6388c
commit e1a05be9d0
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Documentation/git-read-tree.txt
View file

@ -179,6 +179,7 @@ Here are the "carry forward" rules, where "I" denotes the index,
"clean" means that index and work tree coincide, and "exists"/"nothing"
refer to the presence of a path in the specified commit:
....
I H M Result
-------------------------------------------------------
0 nothing nothing nothing (does not happen)
@ -217,6 +218,7 @@ refer to the presence of a path in the specified commit:
19 no no yes exists exists keep index
20 yes yes no exists exists use M
21 no yes no exists exists fail
....
In all "keep index" cases, the index entry stays as in the
original index file. If the entry is not up to date,