mirror of
https://github.com/git/git
synced 2024-08-27 03:29:21 +00:00
![Sergey Organov](/assets/img/avatar_default.png)
New log.diffMerges configuration variable sets the format that --diff-merges=on will be using. The default is "separate". t4013: add the following tests for log.diffMerges config: * Test that wrong values are denied. * Test that the value of log.diffMerges properly affects both --diff-merges=on and -m. t9902: fix completion tests for log.d* to match log.diffMerges. Added documentation for log.diffMerges. Signed-off-by: Sergey Organov <sorganov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
27 lines
643 B
C
27 lines
643 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);
|
|
|
|
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
|