diff options
| author | Sergey Organov <sorganov@gmail.com> | 2020-12-21 18:19:34 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-12-21 13:47:30 -0800 |
| commit | 18f09473bf8685a1f8db254cff915d4c31e86406 (patch) | |
| tree | 699884da0486d3cb3b3b4c25388f6059457e8f3f /builtin/log.c | |
| parent | revision: move diff merges functions to its own diff-merges.c (diff) | |
| download | git-18f09473bf8685a1f8db254cff915d4c31e86406.tar.gz git-18f09473bf8685a1f8db254cff915d4c31e86406.zip | |
diff-merges: rename all functions to have common prefix
Use the same "diff_merges" prefix for all the diff merges function
names.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/log.c')
| -rw-r--r-- | builtin/log.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/log.c b/builtin/log.c index ad3092fdd8..77a7bba543 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -599,7 +599,7 @@ static int show_tree_object(const struct object_id *oid, static void show_setup_revisions_tweak(struct rev_info *rev, struct setup_revision_opt *opt) { - rev_diff_merges_default_to_dense_combined(rev); + diff_merges_default_to_dense_combined(rev); if (!rev->diffopt.output_format) rev->diffopt.output_format = DIFF_FORMAT_PATCH; } @@ -724,7 +724,7 @@ static void log_setup_revisions_tweak(struct rev_info *rev, if (!rev->diffopt.output_format && rev->combine_merges) rev->diffopt.output_format = DIFF_FORMAT_PATCH; - rev_diff_merges_first_parent_defaults_to_enable(rev); + diff_merges_first_parent_defaults_to_enable(rev); } int cmd_log(int argc, const char **argv, const char *prefix) |