summaryrefslogtreecommitdiff
path: root/commit.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-03-04 10:16:42 -0800
committerJunio C Hamano <gitster@pobox.com>2013-03-05 13:39:46 -0800
commit4c4b27e8cefdd88d76590c5fd786d1d43fb6f898 (patch)
treefe26261bf18395c38a6a4e9936caba717a97ea52 /commit.h
parente895cb5135d7fbff8037ce83302aff12ee83667c (diff)
downloadgit-4c4b27e8cefdd88d76590c5fd786d1d43fb6f898.tar.gz
commit.c: add in_merge_bases_many()
Similar to in_merge_bases(commit, other) that returns true when commit is an ancestor (i.e. in the merge bases between the two) of the other commit, in_merge_bases_many(commit, n_other, other[]) checks if commit is an ancestor of any of the other[] commits. Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 b997eeaabd..5057f141f0 100644
--- a/commit.h
+++ b/commit.h
@@ -171,6 +171,7 @@ extern struct commit_list *get_shallow_commits(struct object_array *heads,
int is_descendant_of(struct commit *, struct commit_list *);
int in_merge_bases(struct commit *, struct commit *);
+int in_merge_bases_many(struct commit *, int, struct commit **);
extern int interactive_add(int argc, const char **argv, const char *prefix, int patch);
extern int run_add_interactive(const char *revision, const char *patch_mode,