aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaymond E. Pasco <ray@ameretat.dev>2025-07-07 08:12:33 -0400
committerJunio C Hamano <gitster@pobox.com>2025-07-07 06:41:11 -0700
commit2b49d97fcb8fb2f39ded5b00f0f1a8824267c89e (patch)
tree8bcf615335efa968aa3510e2a8c8c95f049890ca
parentt4140: test apply --intent-to-add interactions (diff)
downloadgit-2b49d97fcb8fb2f39ded5b00f0f1a8824267c89e.tar.gz
git-2b49d97fcb8fb2f39ded5b00f0f1a8824267c89e.zip
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>
-rw-r--r--Documentation/git-apply.adoc9
1 files changed, 5 insertions, 4 deletions
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::