From 4f54544d736e286538ebef0d3120c164f80f04c1 Mon Sep 17 00:00:00 2001 From: Sergey Organov Date: Mon, 21 Dec 2020 18:19:36 +0300 Subject: diff-merges: rename diff_merges_default_to_enable() to match semantics Rename diff_merges_default_to_enable() to diff_merges_default_to_first_parent() to match its semantics. Signed-off-by: Sergey Organov Signed-off-by: Junio C Hamano --- diff-merges.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'diff-merges.c') diff --git a/diff-merges.c b/diff-merges.c index a3bafa92f3..76c8045797 100644 --- a/diff-merges.c +++ b/diff-merges.c @@ -56,7 +56,7 @@ void diff_merges_setup_revs(struct rev_info *revs) die("--combined-all-paths makes no sense without -c or --cc"); } -void diff_merges_default_to_enable(struct rev_info *revs) +void diff_merges_default_to_first_parent(struct rev_info *revs) { if (revs->ignore_merges < 0) /* No -m */ revs->ignore_merges = 0; -- cgit v1.2.3