summaryrefslogtreecommitdiff
path: root/commit.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-12-27 10:43:46 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-12-27 10:43:46 (GMT)
commit37818d7db070f67a20df58ac7d5e04cc63ef1867 (patch)
tree1b1b2b71afab1c4ad29666f56fa8d2560b7855c6 /commit.h
parent4bcb310c2539b66d535e87508d1b7a90fe29c083 (diff)
parentae72f685418b79bbd67e1017c5b1ac7d731c042e (diff)
downloadgit-37818d7db070f67a20df58ac7d5e04cc63ef1867.zip
git-37818d7db070f67a20df58ac7d5e04cc63ef1867.tar.gz
git-37818d7db070f67a20df58ac7d5e04cc63ef1867.tar.bz2
Merge branch 'master' into js/shallow
This is to adjust to: count-objects -v: show number of packs as well. which will break a test in this series. Signed-off-by: Junio C Hamano <junkio@cox.net>
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 e9e158f..936f8fc 100644
--- 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 */