[PATCH] Modify git-rev-list to linearise the commit history in merge order.

[git.git] / commit.h

diff --git a/commit.h b/commit.h
index edfdc12..51d9576 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -32,10 +32,25 @@ void free_commit_list(struct commit_list *list);
 
 void sort_by_date(struct commit_list **list);
 
+/* Commit formats */
+enum cmit_fmt {
+       CMIT_FMT_RAW,
+       CMIT_FMT_MEDIUM,
+       CMIT_FMT_DEFAULT = CMIT_FMT_MEDIUM,
+       CMIT_FMT_SHORT
+};
+
+extern unsigned long pretty_print_commit(enum cmit_fmt fmt, const char *msg, unsigned long len, char *buf, unsigned long space);
+
+void insert_by_date(struct commit_list **list, struct commit *item);
+
 /** Removes the first commit from a list sorted by date, and adds all
  * of its parents.
  **/
 struct commit *pop_most_recent_commit(struct commit_list **list, 
                                      unsigned int mark);
 
+struct commit *pop_commit(struct commit_list **stack);
+
+int count_parents(struct commit * commit);
 #endif /* COMMIT_H */