| Age | Commit message (Expand) | Author | Files | Lines |
|---|
| 2016-04-25 | struct name_entry: use struct object_id instead of unsigned char sha1[20] | brian m. carlson | 1 | -9/+9 |
| 2016-02-22 | use xmallocz to avoid size arithmetic | Jeff King | 1 | -1/+1 |
| 2015-11-20 | Remove get_object_hash. | brian m. carlson | 1 | -2/+2 |
| 2015-11-20 | Convert struct object to object_id | brian m. carlson | 1 | -1/+1 |
| 2015-11-20 | Add several uses of get_object_hash. | brian m. carlson | 1 | -2/+2 |
| 2015-09-28 | react to errors in xdi_diff | Jeff King | 1 | -1/+2 |
| 2014-09-02 | merge-tree: remove unused df_conflict arguments | René Scharfe | 1 | -12/+6 |
| 2013-05-06 | merge-tree: handle directory/empty conflict correctly | John Keeping | 1 | -1/+5 |
| 2013-04-28 | merge-tree: fix typo in "both changed identically" | John Keeping | 1 | -1/+1 |
| 2013-04-08 | merge-tree: don't print entries that match "local" | John Keeping | 1 | -13/+13 |
| 2013-03-27 | merge-tree: fix typo in merge-tree.c::unresolved | John Keeping | 1 | -1/+1 |
| 2012-12-26 | merge-tree: fix d/f conflicts | Junio C Hamano | 1 | -32/+40 |
| 2012-12-26 | merge-tree: add comments to clarify what these functions are doing | Junio C Hamano | 1 | -4/+22 |
| 2012-12-26 | merge-tree: lose unused "resolve_directories" | Junio C Hamano | 1 | -3/+0 |
| 2012-12-26 | merge-tree: lose unused "flags" from merge_list | Junio C Hamano | 1 | -2/+1 |
| 2012-12-09 | Which merge_file() function do you mean? | Junio C Hamano | 1 | -2/+2 |
| 2011-04-11 | sparse: Fix an "symbol 'merge_file' not decared" warning | Ramsay Jones | 1 | -2/+1 |
| 2011-03-22 | Fix sparse warnings | Stephen Boyd | 1 | -1/+1 |
| 2010-07-14 | merge-tree: fix where two branches share no changes | Will Palmer | 1 | -1/+2 |
| 2010-06-21 | Merge branch 'rs/diff-no-minimal' into maint | Junio C Hamano | 1 | -1/+1 |
| 2010-02-22 | Move 'builtin-*' into a 'builtin/' subdirectory | Linus Torvalds | 1 | -0/+358 |
