diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-04-07 02:12:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-07 02:12:48 -0700 |
| commit | dd4bca39eccd01d93fe7916df3b8cb6f68629211 (patch) | |
| tree | ef13090eccd568874f4ee5c67ae3e0390766bb8a /commit.h | |
| parent | Merge branch 'kh/svn' into next (diff) | |
| parent | blame -S <ancestry-file> (diff) | |
| download | git-dd4bca39eccd01d93fe7916df3b8cb6f68629211.tar.gz git-dd4bca39eccd01d93fe7916df3b8cb6f68629211.zip | |
Merge branch 'jc/blame' into next
* jc/blame:
blame -S <ancestry-file>
Match ofs/cnt types in diff interface.
Diffstat (limited to 'commit.h')
| -rw-r--r-- | commit.h | 11 |
1 files changed, 11 insertions, 0 deletions
@@ -90,4 +90,15 @@ void sort_in_topological_order(struct commit_list ** list, int lifo); void sort_in_topological_order_fn(struct commit_list ** list, int lifo, topo_sort_set_fn_t setter, topo_sort_get_fn_t getter); + +struct commit_graft { + unsigned char sha1[20]; + int nr_parent; + unsigned char parent[FLEX_ARRAY][20]; /* more */ +}; + +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); + #endif /* COMMIT_H */ |