X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=commit.h;h=fc13de9780f98c3bd9f330ef6177fd47a4da3d80;hb=c137f40f8a9dfe05ee002cf5f23bf562c1f13100;hp=7c9ca3fbed728d946e48c787720b3ab5ad575a85;hpb=8a02ad4f440da05097416e7ca719360b05d23dbf;p=git.git

diff --git a/commit.h b/commit.h
index 7c9ca3fbe..fc13de978 100644
--- a/commit.h
+++ b/commit.h
@@ -52,7 +52,7 @@ enum cmit_fmt {
 };
 
 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, const char *subject, const char *after_subject);
+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, int relative_date);
 
 /** Removes the first commit from a list sorted by date, and adds all
  * of its parents.
@@ -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 */