Merge branch 'tb/pack-revindex-on-disk'
[git/debian.git] / diff-merges.h
blob659467c99a4f1cbde781c633af7a87ecc287a435
1 #ifndef DIFF_MERGES_H
2 #define DIFF_MERGES_H
4 /*
5 * diff-merges - utility module to handle command-line options for
6 * selection of particular diff format of merge commits
7 * representation.
8 */
10 struct rev_info;
12 int diff_merges_parse_opts(struct rev_info *revs, const char **argv);
14 void diff_merges_suppress(struct rev_info *revs);
16 void diff_merges_default_to_first_parent(struct rev_info *revs);
18 void diff_merges_default_to_dense_combined(struct rev_info *revs);
20 void diff_merges_set_dense_combined_if_unset(struct rev_info *revs);
22 void diff_merges_setup_revs(struct rev_info *revs);
24 #endif