Skip to content

Commit 388d0ff

Browse files
newrengitster
authored andcommitted
git-update-index.txt: reword possibly confusing example
The following phrase could be interpreted multiple ways: "To pretend you have a file with mode and sha1 at path" In particular, I can think of two: 1. Pretend we have some new file, which happens to have a given mode and sha1 2. Pretend one of the files we are already tracking has a different mode and sha1 than what it really does I think people could easily assume either case while reading, but the example command provided doesn't actually handle the first case, which caused some minor frustration to at least one user. Modify the example command so that it correctly handles both cases, and re-order the wording in a way that makes it more likely folks will assume the first interpretation. I believe the new example shouldn't pose any obstacles to those wanting the second interpretation (at worst, they pass an unnecessary extra flag). Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 53f9a3e commit 388d0ff

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Documentation/git-update-index.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,10 +245,10 @@ USING --CACHEINFO OR --INFO-ONLY
245245
current working directory. This is useful for minimum-checkout
246246
merging.
247247

248-
To pretend you have a file with mode and sha1 at path, say:
248+
To pretend you have a file at path with mode and sha1, say:
249249

250250
----------------
251-
$ git update-index --cacheinfo <mode>,<sha1>,<path>
251+
$ git update-index --add --cacheinfo <mode>,<sha1>,<path>
252252
----------------
253253

254254
`--info-only` is used to register files without placing them in the object

0 commit comments

Comments
 (0)