summaryrefslogtreecommitdiff
path: root/commit.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-01-31 18:07:59 -0800
committerJunio C Hamano <gitster@pobox.com>2009-01-31 18:07:59 -0800
commitb37f26d8a2d4551b8ee365e66cbaf3d03b05e74d (patch)
treec0cbe3de06f95fd4f799d938a8b59b23ffb1e70d /commit.h
parent29254142ddac335b33606c0036561f6df89f3d18 (diff)
parent32c35cfb1e9c8523b9d60e5095f1c49ebaef0279 (diff)
downloadgit-b37f26d8a2d4551b8ee365e66cbaf3d03b05e74d.tar.gz
Merge branch 'jg/tag-contains'
* jg/tag-contains: git-tag: Add --contains option Make has_commit() non-static Make opt_parse_with_commit() non-static
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 3a7b06a828..ba9f63813e 100644
--- a/commit.h
+++ b/commit.h
@@ -133,6 +133,7 @@ extern int is_repository_shallow(void);
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);
extern int interactive_add(int argc, const char **argv, const char *prefix);