mirror of
https://github.com/git/git.git
synced 2024-04-19 22:53:59 +02:00
5acffd3473
This fixes 19b2517f (diff-merges: move specific diff-index "-m"
handling to diff-index, 2021-05-21).
That commit disabled handling of all diff for merges options in
diff-index on an assumption that they are unused. However, it later
appeared that -c and --cc, even though undocumented and not being
covered by tests, happen to have had particular effect on diff-index
output.
Restore original -c/--cc options handling by diff-index.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
29 lines
687 B
C
29 lines
687 B
C
#ifndef DIFF_MERGES_H
|
|
#define DIFF_MERGES_H
|
|
|
|
/*
|
|
* diff-merges - utility module to handle command-line options for
|
|
* selection of particular diff format of merge commits
|
|
* representation.
|
|
*/
|
|
|
|
struct rev_info;
|
|
|
|
int diff_merges_config(const char *value);
|
|
|
|
void diff_merges_suppress_m_parsing(void);
|
|
|
|
int diff_merges_parse_opts(struct rev_info *revs, const char **argv);
|
|
|
|
void diff_merges_suppress(struct rev_info *revs);
|
|
|
|
void diff_merges_default_to_first_parent(struct rev_info *revs);
|
|
|
|
void diff_merges_default_to_dense_combined(struct rev_info *revs);
|
|
|
|
void diff_merges_set_dense_combined_if_unset(struct rev_info *revs);
|
|
|
|
void diff_merges_setup_revs(struct rev_info *revs);
|
|
|
|
#endif
|