diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-07-06 19:26:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-06 19:26:13 -0700 |
| commit | bf928e9d2cf124ed73711f90666f9cee3c084e59 (patch) | |
| tree | ab031807768cac726cbd21a941b512f04be3875c /commit.h | |
| parent | Merge branch 'ew/instaweb' (diff) | |
| parent | builtin-rev-parse.c: constness tightening (diff) | |
| download | tgif-bf928e9d2cf124ed73711f90666f9cee3c084e59.tar.xz | |
Merge branch 'js/merge-base'
Diffstat (limited to 'commit.h')
| -rw-r--r-- | commit.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -105,4 +105,6 @@ struct commit_graft *read_graft_line(char *buf, int len); int register_commit_graft(struct commit_graft *, int); int read_graft_file(const char *graft_file); +extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2, int cleanup); + #endif /* COMMIT_H */ |