From 17c13e60fd799336b28d320dcba06fe1ef06e01d Mon Sep 17 00:00:00 2001 From: Sergey Organov Date: Tue, 13 Apr 2021 14:41:17 +0300 Subject: diff-merges: introduce log.diffMerges config variable 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 Signed-off-by: Junio C Hamano --- diff-merges.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'diff-merges.h') diff --git a/diff-merges.h b/diff-merges.h index 659467c99a..09d9a6c9a4 100644 --- a/diff-merges.h +++ b/diff-merges.h @@ -9,6 +9,8 @@ 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); -- cgit v1.2.3