diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-07-14 11:19:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-07-14 11:19:29 -0700 |
| commit | f5b69ee6abb9186898711d9658f0be5dcf67c355 (patch) | |
| tree | 763515aa383626c4f3c3d88ce17cd8bb637a71db /Documentation | |
| parent | 2b5bf70039b027ce37ec2a5442499bb9061c2da0 (diff) | |
| parent | 2b49d97fcb8fb2f39ded5b00f0f1a8824267c89e (diff) | |
| download | git-f5b69ee6abb9186898711d9658f0be5dcf67c355.tar.xz | |
Merge branch 'rp/apply-intent-to-add-fix'
"git apply -N" should start from the current index and register
only new files, but it instead started from an empty index, which
has been corrected.
* rp/apply-intent-to-add-fix:
apply docs: clarify wording for --intent-to-add
t4140: test apply --intent-to-add interactions
apply: only write intents to add for new files
apply: read in the index in --intent-to-add mode
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-apply.adoc | 9 |
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:: |