summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
4e783b4)
The "--cc" implies "-p", but without the recursive part.
Linus
Signed-off-by: Junio C Hamano <junkio@cox.net>
}
usage(diff_tree_usage);
}
}
usage(diff_tree_usage);
}
- if (diff_options.output_format == DIFF_FORMAT_PATCH)
- diff_options.recursive = 1;
if (combine_merges) {
diff_options.output_format = DIFF_FORMAT_PATCH;
ignore_merges = 0;
}
if (combine_merges) {
diff_options.output_format = DIFF_FORMAT_PATCH;
ignore_merges = 0;
}
+ if (diff_options.output_format == DIFF_FORMAT_PATCH)
+ diff_options.recursive = 1;
+
diff_tree_setup_paths(get_pathspec(prefix, argv));
diff_setup_done(&diff_options);
diff_tree_setup_paths(get_pathspec(prefix, argv));
diff_setup_done(&diff_options);