diff options
| author | Sergey Organov <sorganov@gmail.com> | 2020-12-21 16:19:32 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-12-21 22:47:30 +0100 |
| commit | 3d4fd9436337d1688e7e2c2b2da4f7b7e3e8591e (patch) | |
| tree | 77e732ff66e52a74abf2cc59b0cd90ba9ccccc46 /revision.h | |
| parent | revision: factor out initialization of diff-merge related settings (diff) | |
| download | git-3d4fd9436337d1688e7e2c2b2da4f7b7e3e8591e.tar.xz git-3d4fd9436337d1688e7e2c2b2da4f7b7e3e8591e.zip | |
revision: provide implementation for diff merges tweaks
Use these implementations from show_setup_revisions_tweak() and
log_setup_revisions_tweak() in builtin/log.c.
This completes moving of management of diff merges parameters to a
single place, where we can finally observe them simultaneously.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'revision.h')
| -rw-r--r-- | revision.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/revision.h b/revision.h index f6bf860d19..3dd0229f4e 100644 --- a/revision.h +++ b/revision.h @@ -456,4 +456,7 @@ int rewrite_parents(struct rev_info *revs, */ struct commit_list *get_saved_parents(struct rev_info *revs, const struct commit *commit); +void rev_diff_merges_default_to_dense_combined(struct rev_info *revs); +void rev_diff_merges_first_parent_defaults_to_enable(struct rev_info *revs); + #endif |