summaryrefslogtreecommitdiff
path: root/commit.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-01-07 07:33:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-01-07 07:33:44 (GMT)
commit45a177069f1ed9f56ab13cd34c654ecc5376945b (patch)
treeb240857a0ea72029ec1e86ba291b33b1a4b3664e /commit.h
parentd3fa84d52873cdf3852e41b684ab93475fe4424f (diff)
parent8119214f4e7036cef01a8e13f161ec510b3ff710 (diff)
downloadgit-45a177069f1ed9f56ab13cd34c654ecc5376945b.zip
git-45a177069f1ed9f56ab13cd34c654ecc5376945b.tar.gz
git-45a177069f1ed9f56ab13cd34c654ecc5376945b.tar.bz2
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.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/commit.h b/commit.h
index 742a6de..f4e7b01 100644
--- a/commit.h
+++ b/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 */