path: root/Documentation/git-update-index.txt
diff options
authorJunio C Hamano <>2018-08-08 21:35:18 (GMT)
committerJunio C Hamano <>2018-08-08 21:53:39 (GMT)
commite05aa688dd3df580c38d1df639cf37e45b66a3ee (patch)
treea1939ad1a179563af804982cdf1468cae951bf93 /Documentation/git-update-index.txt
parent53f9a3e157dbbc901a02ac2c73346d375e24978c (diff)
update-index: there no longer is `apply --index-info`
Back when we removed `git apply --index-info` in 2007, we forgot to adjust the documentation for update-index that reads its output. Let's reorder the description of three formats to present the other two formats that are still generated by git commands before this format, and stop mentioning `git apply --index-info`. Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'Documentation/git-update-index.txt')
1 files changed, 6 insertions, 9 deletions
diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt
index 4e8e762..c62a683 100644
--- a/Documentation/git-update-index.txt
+++ b/Documentation/git-update-index.txt
@@ -268,23 +268,20 @@ USING --INDEX-INFO
multiple entry definitions from the standard input, and designed
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
-The second format is to stuff 'git ls-tree' output
-into the index file.
+This format is to stuff `git ls-tree` output into the index.
. mode SP sha1 SP stage TAB path
This format is to put higher order stages into the
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
first be removed by feeding a mode=0 entry for the path, and
then feeding necessary input lines in the third format.