From 7acf0d06f54043b3b79d5d388ed1c8fb66e2db5a Mon Sep 17 00:00:00 2001 From: Sergey Organov Date: Mon, 21 Dec 2020 18:19:35 +0300 Subject: diff-merges: move checks for first_parent_only out of the module The checks for first_parent_only don't in fact belong to this module, as the primary purpose of this flag is history traversal limiting, so get it out of this module and rename the diff_merges_first_parent_defaults_to_enable() to diff_merges_default_to_enable() to match new semantics. Signed-off-by: Sergey Organov Signed-off-by: Junio C Hamano --- diff-merges.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'diff-merges.h') diff --git a/diff-merges.h b/diff-merges.h index 4ced909b79..6937d46219 100644 --- a/diff-merges.h +++ b/diff-merges.h @@ -17,7 +17,7 @@ void diff_merges_setup_revs(struct rev_info *revs); void diff_merges_default_to_dense_combined(struct rev_info *revs); -void diff_merges_first_parent_defaults_to_enable(struct rev_info *revs); +void diff_merges_default_to_enable(struct rev_info *revs); #endif -- cgit 1.2.3-korg