From: Raymond E. Pasco Date: Mon, 7 Jul 2025 12:12:33 +0000 (-0400) Subject: apply docs: clarify wording for --intent-to-add X-Git-Tag: v2.51.0-rc0~68^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2b49d97fcb8fb2f39ded5b00f0f1a8824267c89e;p=thirdparty%2Fgit.git 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 Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-apply.adoc b/Documentation/git-apply.adoc index 952518b8af..6c71ee69da 100644 --- a/Documentation/git-apply.adoc +++ b/Documentation/git-apply.adoc @@ -75,13 +75,14 @@ OPTIONS tree. If `--check` is in effect, merely check that it would apply cleanly to the index entry. +-N:: --intent-to-add:: When applying the patch only to the working tree, mark new files to be added to the index later (see `--intent-to-add` - option in linkgit:git-add[1]). This option is ignored unless - running in a Git repository and `--index` is not specified. - Note that `--index` could be implied by other options such - as `--cached` or `--3way`. + option in linkgit:git-add[1]). This option is ignored if + `--index` or `--cached` are used, and has no effect outside a Git + repository. Note that `--index` could be implied by other options + such as `--3way`. -3:: --3way::