diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-01-06 23:33:44 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-01-06 23:33:44 -0800 |
commit | 45a177069f1ed9f56ab13cd34c654ecc5376945b (patch) | |
tree | b240857a0ea72029ec1e86ba291b33b1a4b3664e /commit.h | |
parent | Merge branch 'fc/pull-merge-rebase' (diff) | |
parent | merge-ort: implement merge_incore_recursive() (diff) | |
download | tgif-45a177069f1ed9f56ab13cd34c654ecc5376945b.tar.xz |
Merge branch 'en/merge-ort-recursive'
The ORT merge strategy learned to synthesize virtual ancestor tree
by recursively merging multiple merge bases together, just like the
recursive backend has done for years.
* en/merge-ort-recursive:
merge-ort: implement merge_incore_recursive()
merge-ort: make clear_internal_opts() aware of partial clearing
merge-ort: copy a few small helper functions from merge-recursive.c
commit: move reverse_commit_list() from merge-recursive
Diffstat (limited to 'commit.h')
-rw-r--r-- | commit.h | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -179,6 +179,9 @@ void commit_list_sort_by_date(struct commit_list **list); /* Shallow copy of the input list */ struct commit_list *copy_commit_list(struct commit_list *list); +/* Modify list in-place to reverse it, returning new head; list will be tail */ +struct commit_list *reverse_commit_list(struct commit_list *list); + void free_commit_list(struct commit_list *list); struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */ |