This patch series cleans up diff output format options. This makes it possible to use any combination of --raw, -p, --stat and --summary options and they work as you would expect. These patches passed all tests but patch 2/5 is quite intrusive... b/builtin-diff-files.c | 10 +- b/builtin-diff-index.c | 4 b/builtin-diff-stages.c | 3 b/builtin-diff-tree.c | 3 b/builtin-diff.c | 74 ++++++----------- b/builtin-log.c | 12 +- b/combine-diff.c | 45 +++------- b/diff.c | 207 +++++++++++++++++++++++------------------------- b/diff.h | 29 +++--- b/git-merge.sh | 3 b/log-tree.c | 15 ++- b/revision.c | 5 - 12 files changed, 196 insertions(+), 214 deletions(-) -- http://onion.dynserv.net/~timo/ - : 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