From 564a4fc8471b41fc05bda16e4bbb02a99b515cbf Mon Sep 17 00:00:00 2001 From: Sergey Organov Date: Mon, 21 Dec 2020 18:19:37 +0300 Subject: diff-merges: re-arrange functions to match the order they are called in For clarity, define public functions in the order they are called, to make logic inter-dependencies easier to grok. Signed-off-by: Sergey Organov Signed-off-by: Junio C Hamano --- diff-merges.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'diff-merges.h') diff --git a/diff-merges.h b/diff-merges.h index 18861dc548..243ef915c4 100644 --- a/diff-merges.h +++ b/diff-merges.h @@ -13,11 +13,10 @@ void diff_merges_init_revs(struct rev_info *revs); int diff_merges_parse_opts(struct rev_info *revs, const char **argv); -void diff_merges_setup_revs(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_default_to_first_parent(struct rev_info *revs); - +void diff_merges_setup_revs(struct rev_info *revs); #endif -- cgit v1.2.3