diff --git a/commit.h b/commit.h
index 01eec60a1ecc2ff3c73850cb510ba71767e47e03..779ed82ed0ce2fb1a643b1cfa0ffe0fd3107ed09 100644 (file)
--- a/commit.h
+++ b/commit.h
struct commit {
struct object object;
struct commit {
struct object object;
+ void *util;
unsigned long date;
struct commit_list *parents;
struct tree *tree;
unsigned long date;
struct commit_list *parents;
struct tree *tree;
};
extern enum cmit_fmt get_commit_format(const char *arg);
};
extern enum cmit_fmt get_commit_format(const char *arg);
-extern unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *, unsigned long len, char *buf, unsigned long space, int abbrev);
+extern unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *, unsigned long len, char *buf, unsigned long space, int abbrev, const char *subject, const char *after_subject);
/** Removes the first commit from a list sorted by date, and adds all
* of its parents.
/** Removes the first commit from a list sorted by date, and adds all
* of its parents.
int register_commit_graft(struct commit_graft *, int);
int read_graft_file(const char *graft_file);
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 */
#endif /* COMMIT_H */