Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Documentation: reorder development section, todo's
[gitweb.git]
/
commit.h
diff --git
a/commit.h
b/commit.h
index e9e158f4e1c670635dda02766f67da3821374669..936f8fce301672b5b78352a217403cc319ab3f07 100644
(file)
--- a/
commit.h
+++ b/
commit.h
@@
-114,4
+114,5
@@
extern int is_repository_shallow();
extern struct commit_list *get_shallow_commits(struct object_array *heads,
int depth, int shallow_flag, int not_shallow_flag);
+int in_merge_bases(struct commit *rev1, struct commit *rev2);
#endif /* COMMIT_H */