summaryrefslogtreecommitdiffstats
path: root/diff-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-10-18 18:58:09 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-10-18 18:58:09 +0000
commita2deec5920d1cc24a58ea6af6f0f7d36dedd0f7d (patch)
treecd639cd15f5ca1a220f7bff658919329d6d8f028 /diff-options.txt
parentcbb30868adff9a0bcc3fa4c15cd5d70e159bd32a (diff)
downloadgit-htmldocs-a2deec5920d1cc24a58ea6af6f0f7d36dedd0f7d.tar.gz
Autogenerated HTML docs for v1.6.0.2-554-g3041b
Diffstat (limited to 'diff-options.txt')
-rw-r--r--diff-options.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/diff-options.txt b/diff-options.txt
index 7788d4fa4..c62b45cdb 100644
--- a/diff-options.txt
+++ b/diff-options.txt
@@ -137,7 +137,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