X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-diff-tree.html;h=4ced0304003a7e0211780ee2ac5ee1d3f8b771d0;hb=2abe7e860dae61000d304bc1e865406ddc7e4ba1;hp=598bc87b932beb6ab93e9776501dbcc247ea4054;hpb=d9d71c0a24952e5a75af5d3e9e5cba951ae0ce17;p=git.git diff --git a/git-diff-tree.html b/git-diff-tree.html index 598bc87b..4ced0304 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -375,6 +375,22 @@ git-diff-tree(1) Manual Page

+--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 + 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. +

+
+
--find-copies-harder
@@ -939,7 +955,7 @@ two unresolved merge parents with the working tree file