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