Make merge-cache not fail immediatelly when the merge program

[git.git] / commit.h

diff --git a/commit.h b/commit.h
index 4afd27b..ce0b436 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -20,8 +20,20 @@ extern const char *commit_type;
 
 struct commit *lookup_commit(unsigned char *sha1);
 
+int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size);
+
 int parse_commit(struct commit *item);
 
+void commit_list_insert(struct commit *item, struct commit_list **list_p);
+
 void free_commit_list(struct commit_list *list);
 
+void sort_by_date(struct commit_list **list);
+
+/** 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);
+
 #endif /* COMMIT_H */