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
This commit is contained in:
3
commit.h
3
commit.h
@@ -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 */
|
||||
|
||||
Reference in New Issue
Block a user