diff options
| author | Sergey Organov <sorganov@gmail.com> | 2020-12-21 15:19:37 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-12-21 21:47:31 (GMT) |
| commit | 564a4fc8471b41fc05bda16e4bbb02a99b515cbf (patch) | |
| tree | 6afadc528467d146595b7fe3bd96869cebeb91bc /diff-merges.h | |
| parent | 4f54544d736e286538ebef0d3120c164f80f04c1 (diff) | |
| download | git-564a4fc8471b41fc05bda16e4bbb02a99b515cbf.zip git-564a4fc8471b41fc05bda16e4bbb02a99b515cbf.tar.gz git-564a4fc8471b41fc05bda16e4bbb02a99b515cbf.tar.bz2 | |
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 <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff-merges.h')
| -rw-r--r-- | diff-merges.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/diff-merges.h b/diff-merges.h index 18861dc..243ef91 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 |