summaryrefslogtreecommitdiff
path: root/commit.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-08-27 14:46:01 -0700
committerJunio C Hamano <gitster@pobox.com>2012-08-27 18:36:39 -0700
commita20efee9cfcf9c68bb01d0aa82ffc7903d88bab4 (patch)
treee329f429d9abd42f015099a072efedcfd385ec46 /commit.h
parentd0f1ea6003d97e63110fa7d50bb07f546a909b6e (diff)
downloadgit-a20efee9cfcf9c68bb01d0aa82ffc7903d88bab4.tar.gz
in_merge_bases(): support only one "other" commit
In early days of its life, I planned to make it possible to compute "is a commit contained in all of these other commits?" with this function, but it turned out that no caller needed it. Just make it take two commit objects and add a comment to say what these two functions do. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit.h')
-rw-r--r--commit.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/commit.h b/commit.h
index 154c0e34ff..5bb8a884bd 100644
--- a/commit.h
+++ b/commit.h
@@ -168,7 +168,7 @@ extern struct commit_list *get_shallow_commits(struct object_array *heads,
int depth, int shallow_flag, int not_shallow_flag);
int is_descendant_of(struct commit *, struct commit_list *);
-int in_merge_bases(struct commit *, struct commit **, int);
+int in_merge_bases(struct commit *, 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,