diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-20 13:15:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-20 13:15:42 -0700 |
| commit | 11ae320e2426a014c516958921458ae1382a84f4 (patch) | |
| tree | 5cfcb5266179992591032f26824a17d130117610 /git-update-index.txt | |
| parent | bfd91f4e89b5ab0f4238e1bfb7bd0e2a82adc225 (diff) | |
| download | git-htmldocs-11ae320e2426a014c516958921458ae1382a84f4.tar.gz | |
Autogenerated HTML docs for v2.19.0-rc0
Diffstat (limited to 'git-update-index.txt')
| -rw-r--r-- | git-update-index.txt | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/git-update-index.txt b/git-update-index.txt index 4e8e762e6..1c4d146a4 100644 --- a/git-update-index.txt +++ b/git-update-index.txt @@ -245,10 +245,10 @@ USING --CACHEINFO OR --INFO-ONLY current working directory. This is useful for minimum-checkout merging. -To pretend you have a file with mode and sha1 at path, say: +To pretend you have a file at path with mode and sha1, say: ---------------- -$ git update-index --cacheinfo <mode>,<sha1>,<path> +$ git update-index --add --cacheinfo <mode>,<sha1>,<path> ---------------- `--info-only` is used to register files without placing them in the object @@ -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. |