X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=commit.h;h=779ed82ed0ce2fb1a643b1cfa0ffe0fd3107ed09;hb=3899e7a329aabfc22eca9beb82599e1bb214b3d2;hp=c9de1677e903ead414e5133424b722bea907b4d9;hpb=a861b58bbf4bced62a0b8faa8deba107edb0bffd;p=git.git diff --git a/commit.h b/commit.h index c9de1677e..779ed82ed 100644 --- a/commit.h +++ b/commit.h @@ -11,6 +11,7 @@ struct commit_list { struct commit { struct object object; + void *util; unsigned long date; struct commit_list *parents; struct tree *tree; @@ -104,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 */