summaryrefslogtreecommitdiff
path: root/Documentation/git-update-index.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-08-20 18:33:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-08-20 18:33:50 (GMT)
commit6e8f3d1ca06f42714bc82070513a5d8d0ef15da4 (patch)
treebc93475479e643741ee3b2cbfefa7c1840682f7d /Documentation/git-update-index.txt
parent7d916990ba108ed78fec91bd201e7175c2110cb2 (diff)
parente05aa688dd3df580c38d1df639cf37e45b66a3ee (diff)
downloadgit-6e8f3d1ca06f42714bc82070513a5d8d0ef15da4.zip
git-6e8f3d1ca06f42714bc82070513a5d8d0ef15da4.tar.gz
git-6e8f3d1ca06f42714bc82070513a5d8d0ef15da4.tar.bz2
Merge branch 'jc/update-index-doc'
Doc update. * jc/update-index-doc: update-index: there no longer is `apply --index-info`
Diffstat (limited to 'Documentation/git-update-index.txt')
-rw-r--r--Documentation/git-update-index.txt15
1 files changed, 6 insertions, 9 deletions
diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt
index a9753e6..1c4d146 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.