diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-01-09 14:32:57 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-01-09 14:32:57 -0800 |
| commit | 6366dd9000a3f67e47a30d94375a88dabc18ec6f (patch) | |
| tree | 1ebaba69306b8fe1466f2a39f283e61a2640e7fd /Documentation | |
| parent | 4e51984e825a8bc397333bbb946f71f491abf796 (diff) | |
| parent | 46af107bdef7bd9892bf504aa874d24f826dd4ba (diff) | |
| download | git-6366dd9000a3f67e47a30d94375a88dabc18ec6f.tar.gz git-6366dd9000a3f67e47a30d94375a88dabc18ec6f.tar.xz | |
Merge branch 'jk/doc-diff-options'
Doc update.
* jk/doc-diff-options:
docs/diff-options: clarify scope of diff-filter types
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/diff-options.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 9d1586b95..743af97b0 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -469,6 +469,12 @@ 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. -S<string>:: Look for differences that change the number of occurrences of |