summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-01-09 14:32:57 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-01-09 14:32:57 -0800
commit6366dd9000a3f67e47a30d94375a88dabc18ec6f (patch)
tree1ebaba69306b8fe1466f2a39f283e61a2640e7fd /Documentation
parentMerge branch 'bw/protocol-v1' (diff)
parentdocs/diff-options: clarify scope of diff-filter types (diff)
downloadtgif-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.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 9d1586b956..743af97b06 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