diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-10-18 08:26:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-10-18 08:26:44 -0700 |
| commit | 58e0fa5416c0a91761d904fd097c2ba9e45e3654 (patch) | |
| tree | 595dd91831f6bd88448b62eea08a208346cd0814 /Documentation/diff-options.txt | |
| parent | f4a75a416f62c0494e06cb42a11c7cc70ec9303e (diff) | |
| parent | f430c8e44d0548e844d817fc32be7c38b2b6856c (diff) | |
| download | git-58e0fa5416c0a91761d904fd097c2ba9e45e3654.tar.gz git-58e0fa5416c0a91761d904fd097c2ba9e45e3654.tar.xz | |
Merge branch 'maint'
* maint:
Hopefully the final draft release notes update before 1.6.0.3
diff(1): clarify what "T"ypechange status means
contrib: update packinfo.pl to not use dashed commands
force_object_loose: Fix memory leak
tests: shell negation portability fix
Diffstat (limited to 'Documentation/diff-options.txt')
| -rw-r--r-- | Documentation/diff-options.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 7788d4fa4..c62b45cdb 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/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 |