summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
057c7d3)
Normally we show every facet of a merge, but when we're silent,
there's little point.
return -1;
header = generate_header(name, sha1_to_hex(parent), buf, size);
diff_tree_sha1_top(parent, commit, "");
return -1;
header = generate_header(name, sha1_to_hex(parent), buf, size);
diff_tree_sha1_top(parent, commit, "");
- if (!header && verbose_header)
+ if (!header && verbose_header) {
header_prefix = "\ndiff-tree ";
header_prefix = "\ndiff-tree ";
+ /*
+ * Don't print multiple merge entries if we
+ * don't print the diffs.
+ */
+ if (silent)
+ break;
+ }
offset += 48;
}
return 0;
offset += 48;
}
return 0;