undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/update-index-doc'

Browse Source 
Doc update.

* jc/update-index-doc:
  update-index: there no longer is `apply --index-info`
This commit is contained in:
Junio C Hamano 2018-08-20 11:33:50 -07:00
commit 6e8f3d1ca0
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Documentation/git-update-index.txt
View File

@ -268,23 +268,20 @@ USING --INDEX-INFO
multiple entry definitions from the standard input, and designed multiple entry definitions from the standard input, and designed
specifically for scripts. It can take inputs of three formats: specifically for scripts. It can take inputs of three formats:
. mode SP sha1 TAB path
+
The first format is what "git-apply --index-info"
reports, and used to reconstruct a partial tree
that is used for phony merge base tree when falling
back on 3-way merge.
. mode SP type SP sha1 TAB path . mode SP type SP sha1 TAB path
+ +
The second format is to stuff 'git ls-tree' output This format is to stuff `git ls-tree` output into the index.
into the index file.
. mode SP sha1 SP stage TAB path . mode SP sha1 SP stage TAB path
+ +
This format is to put higher order stages into the This format is to put higher order stages into the
index file and matches 'git ls-files --stage' output. index file and matches 'git ls-files --stage' output.
. mode SP sha1 TAB path
+
This format is no longer produced by any Git command, but is
and will continue to be supported by `update-index --index-info`.
To place a higher stage entry to the index, the path should To place a higher stage entry to the index, the path should
first be removed by feeding a mode=0 entry for the path, and first be removed by feeding a mode=0 entry for the path, and
then feeding necessary input lines in the third format. then feeding necessary input lines in the third format.