dilim/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-08-03 22:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jc/merge-base' (early part)

Browse Source 
This contains an evil merge to fast-import, in order to
resolve in_merge_bases() update.
This commit is contained in:
Junio C Hamano
2007-02-13 16:50:32 -08:00
parent f8f2aaa172 03840fc32d
commit 4a164d48df
9 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
commit.h
View File

@@ -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 */