git log: don't do merge diffs by default

diff --git a/diff-tree.c b/diff-tree.c
index 54157e40dd8b2a3596f73284ffe0a1511f6c0952..7207867a74d0869c6a6b839c040321c843ee9c2f 100644 (file)
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -69,6 +69,9 @@ int main(int argc, const char **argv)
 
        git_config(git_diff_config);
        nr_sha1 = 0;
+       init_revisions(opt);
+       opt->abbrev = 0;
+       opt->diff = 1;
        argc = setup_revisions(argc, argv, opt, NULL);
 
        while (--argc > 0) {