From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 20 Aug 2018 18:33:50 +0000 (-0700)
Subject: Merge branch 'jc/update-index-doc'
X-Git-Tag: v2.19.0-rc0~27
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6e8f3d1ca06f42714bc82070513a5d8d0ef15da4?hp=-c

Merge branch 'jc/update-index-doc'

Doc update.

* jc/update-index-doc:
update-index: there no longer is `apply --index-info`
---

6e8f3d1ca06f42714bc82070513a5d8d0ef15da4
diff --combined Documentation/git-update-index.txt
index a9753e6557,c62a683648..1c4d146a41
--- a/Documentation/git-update-index.txt
+++ b/Documentation/git-update-index.txt
@@@ -245,10 -245,10 +245,10 @@@ USING --CACHEINFO OR --INFO-ONL
  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 +268,20 @@@ USING --INDEX-INF
  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.