Quoting Junio C Hamano <gitster@xxxxxxxxx>: > > Nanako Shiraishi <nanako3@xxxxxxxxxxx> writes: > >> Quoting Anders Melchiorsen <mail@xxxxxxxxxxxxxxxx>: >> >>> diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt >>> index 7788d4f..7604a13 100644 >>> --- a/Documentation/diff-options.txt >>> +++ b/Documentation/diff-options.txt >>> @@ -137,7 +137,7 @@ 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 (symlink/regular file) 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 >>> -- >>> 1.6.0.2.514.g23abd3 >> >> Are symlinks and regular files the only kind of object you can see in >> diff? What happens when a file or directory changes to a submodule? > > Oops. I've already applied Anders's patch, but you are right. A change > from a blob to submodule also shows up as a typechange event. > > Perhaps we should just remove the parenthesised comment from there > instead. I'll rewind and rebuild, as I haven't pushed the results out > yet (lucky me). I see that you pushed out this change already, and you changed your mind and described them all. I think the result reads better. -- Nanako Shiraishi http://ivory.ap.teacup.com/nanako3/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
