Git fork

apply docs: clarify wording for --intent-to-add

Avoid using a double negative, and keep in mind that --index and
--cached are distinct modes of operation.

Signed-off-by: Raymond E. Pasco <ray@ameretat.dev>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

authored by

Raymond E. Pasco and committed by
Junio C Hamano
2b49d97f a4c969aa

+5 -4
+5 -4
Documentation/git-apply.adoc
··· 75 75 tree. If `--check` is in effect, merely check that it would 76 76 apply cleanly to the index entry. 77 77 78 + -N:: 78 79 --intent-to-add:: 79 80 When applying the patch only to the working tree, mark new 80 81 files to be added to the index later (see `--intent-to-add` 81 - option in linkgit:git-add[1]). This option is ignored unless 82 - running in a Git repository and `--index` is not specified. 83 - Note that `--index` could be implied by other options such 84 - as `--cached` or `--3way`. 82 + option in linkgit:git-add[1]). This option is ignored if 83 + `--index` or `--cached` are used, and has no effect outside a Git 84 + repository. Note that `--index` could be implied by other options 85 + such as `--3way`. 85 86 86 87 -3:: 87 88 --3way::