Merge branch 'js/rebase-autostash-fix'

diff --git a/commit.h b/commit.h
index 2b1a73438873f20e2c9e570121a2e024d7762fbe..6c4428c5931a9ab9d77d96a8a21aba4d75d73108 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -202,8 +202,11 @@ typedef int (*each_commit_graft_fn)(const struct commit_graft *, void *);
 
 struct commit_graft *read_graft_line(struct strbuf *line);
 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