path: root/Documentation
diff options
authorJon Loeliger <>2006-02-09 15:12:11 (GMT)
committerJunio C Hamano <>2006-02-09 20:06:57 (GMT)
commit147cf31738e5e66aa304897ede6b556d4e204967 (patch)
tree0a1357407815038820e5c01dc3a200fab2af84b2 /Documentation
parentd19e06fa8f86b611c10115903ef7e50d5de112f0 (diff)
Add --diff-filter= documentation paragraph
Signed-off-by: Jon Loeliger <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'Documentation')
1 files changed, 11 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 5c85167..2a0275e 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -35,6 +35,17 @@
Detect copies as well as renames.
+ Select only files that are Added (`A`), Copied (`C`),
+ Deleted (`D`), Modified (`M`), Renamed (`R`), have their
+ type (mode) changed (`T`), are Unmerged (`U`), are
+ Unknown (`X`), or have had their pairing Broken (`B`).
+ Any combination of the filter characters may be used.
+ When `*` (All-or-none) is added to the combination, all
+ paths are selected if there is any file that matches
+ other criteria in the comparison; if there is no file
+ that matches other criteria, nothing is selected.
For performance reasons, by default, -C option finds copies only
if the original file of the copy was modified in the same