Merge branch 'pk/rebase-in-c-4-opts'

diff --git a/commit.h b/commit.h
index 1d260d62f57a24864986252892faa89c17572210..6c4428c5931a9ab9d77d96a8a21aba4d75d73108 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -205,6 +205,8 @@ int register_commit_graft(struct repository *r, struct commit_graft *, int);
 void prepare_commit_graft(struct repository *r);
 struct commit_graft *lookup_commit_graft(struct repository *r, const struct object_id *oid);
 
+struct commit *get_fork_point(const char *refname, struct commit *commit);
+
 /* largest positive number a signed 32-bit integer can contain */
 #define INFINITE_DEPTH 0x7fffffff