static int no_commit_id = 0;
static int verbose_header = 0;
static int ignore_merges = 1;
-static int show_empty_combined = 0;
static int combine_merges = 0;
static int dense_combined_merges = 0;
static int read_stdin = 0;
else if (combine_merges) {
header = generate_header(sha1, sha1, commit);
return diff_tree_combined_merge(sha1, header,
- show_empty_combined,
dense_combined_merges);
}
}
if (combine_merges) {
diff_options.output_format = DIFF_FORMAT_PATCH;
- show_empty_combined = !ignore_merges;
ignore_merges = 0;
}