summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-10-18 08:20:51 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-10-18 08:20:51 -0700
commitf07c3c53f8e7f243730de74918abcc72bd85c2ef (patch)
treead96201e2309ea1563c3e6ac8f9841c3c6e511c0
parentMerge branch 'db/maint-checkout-b' into maint (diff)
downloadtgif-f07c3c53f8e7f243730de74918abcc72bd85c2ef.tar.xz
diff(1): clarify what "T"ypechange status means
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/diff-options.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 746646bb3d..45885bbbb2 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -134,7 +134,8 @@ endif::git-format-patch[]
--diff-filter=[ACDMRTUXB*]::
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
+ type (i.e. regular file, symlink, submodule, ...) 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