summaryrefslogtreecommitdiff
path: root/commit.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-12-19 00:14:04 -0800
committerJunio C Hamano <junkio@cox.net>2006-12-20 17:22:10 -0800
commit2ecd2bbcbe5335c1d9209b6ce28513e4e9d3491b (patch)
tree86d8f3803b12256607153517b804f8a80d6a332c /commit.h
parente29cb53a8b6aa1256221207b14a1c8ef72f69d9f (diff)
downloadgit-2ecd2bbcbe5335c1d9209b6ce28513e4e9d3491b.tar.gz
Move in_merge_bases() to commit.c
This reasonably useful function was hidden inside builtin-branch.c
Diffstat (limited to 'commit.h')
-rw-r--r--commit.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/commit.h b/commit.h
index fc13de9780..10eea9f26f 100644
--- a/commit.h
+++ b/commit.h
@@ -107,4 +107,5 @@ int read_graft_file(const char *graft_file);
extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2, int cleanup);
+int in_merge_bases(struct commit *rev1, struct commit *rev2);
#endif /* COMMIT_H */