Skip to content

Commit d843e31

Browse files
dschogitster
authored andcommitted
docs(diff): lose incorrect claim about diff-files --diff-filter=A
Originally, before we had `--intent-to-add`, there was no way that `git diff-files` could see added files: if a file did not exist in the index, `git diff-files` would not show it because it looks only at worktree files when there is an index entry at the same path. We used this example in the documentation of the diff options to explain that not every `--diff-filter=<option>` has an effect in all scenarios. Even when we added `--intent-to-add`, the comment was still correct, because initially we showed such files as modified instead of added. However, when that bug was fixed in feea694 (diff-files: treat "i-t-a" files as "not-in-index", 2020-06-20), the comment in the documentation became incorrect. Let's just remove it. Signed-off-by: Johannes Schindelin <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 89bece5 commit d843e31

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

Documentation/diff-options.txt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -616,11 +616,8 @@ ifndef::git-format-patch[]
616616
Also, these upper-case letters can be downcased to exclude. E.g.
617617
`--diff-filter=ad` excludes added and deleted paths.
618618
+
619-
Note that not all diffs can feature all types. For instance, diffs
620-
from the index to the working tree can never have Added entries
621-
(because the set of paths included in the diff is limited by what is in
622-
the index). Similarly, copied and renamed entries cannot appear if
623-
detection for those types is disabled.
619+
Note that not all diffs can feature all types. For instance, copied and
620+
renamed entries cannot appear if detection for those types is disabled.
624621

625622
-S<string>::
626623
Look for differences that change the number of occurrences of

0 commit comments

Comments
 (0)