diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-14 01:50:32 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-14 01:54:35 +0100 |
| commit | 4a164d48df6bb1b4a771741c63d4437fd2dca0bb (patch) | |
| tree | 73e3b0ca16e8ea83e9f761af476736c29b24caf9 /commit.h | |
| parent | Merge branch 'jc/deprecate' (diff) | |
| parent | Allow in_merge_bases() to take more than one reference commits. (diff) | |
| download | git-4a164d48df6bb1b4a771741c63d4437fd2dca0bb.tar.xz git-4a164d48df6bb1b4a771741c63d4437fd2dca0bb.zip | |
Merge branch 'jc/merge-base' (early part)
This contains an evil merge to fast-import, in order to
resolve in_merge_bases() update.
Diffstat (limited to 'commit.h')
| -rw-r--r-- | commit.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -114,5 +114,5 @@ 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 in_merge_bases(struct commit *rev1, struct commit *rev2); +int in_merge_bases(struct commit *, struct commit **, int); #endif /* COMMIT_H */ |