diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-02-16 15:14:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-02-16 15:14:30 -0800 |
| commit | 9a160990ef3a16fab8d54752d0d9b981d15b00c5 (patch) | |
| tree | 8c8fdf47b518062223f49fb1105879c5ba3a06cc /Documentation/diff-options.txt | |
| parent | 70ff41ffcf93aed8198368af435b0c53fe55ed05 (diff) | |
| parent | 75408ca94980c125b3a800003c3e6b7cdcb27d44 (diff) | |
| download | git-9a160990ef3a16fab8d54752d0d9b981d15b00c5.tar.gz | |
Merge branch 'js/diff-filter-negation-fix'
"git diff --diff-filter=aR" is now parsed correctly.
* js/diff-filter-negation-fix:
diff-filter: be more careful when looking for negative bits
diff.c: move the diff filter bits definitions up a bit
docs(diff): lose incorrect claim about `diff-files --diff-filter=A`
Diffstat (limited to 'Documentation/diff-options.txt')
| -rw-r--r-- | Documentation/diff-options.txt | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 7e27841a95..3674ac48e9 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -628,11 +628,8 @@ ifndef::git-format-patch[] Also, these upper-case letters can be downcased to exclude. E.g. `--diff-filter=ad` excludes added and deleted paths. + -Note that not all diffs can feature all types. For instance, diffs -from the index to the working tree can never have Added entries -(because the set of paths included in the diff is limited by what is in -the index). Similarly, copied and renamed entries cannot appear if -detection for those types is disabled. +Note that not all diffs can feature all types. For instance, copied and +renamed entries cannot appear if detection for those types is disabled. -S<string>:: Look for differences that change the number of occurrences of |