Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'jk/no-diff-emit-common' | Junio C Hamano | 2016-02-26 |
|\ | |||
| * | merge-tree: drop generate_common strategy | Jeff King | 2016-02-22 |
* | | Remove get_object_hash. | brian m. carlson | 2015-11-20 |
* | | Add several uses of get_object_hash. | brian m. carlson | 2015-11-20 |
|/ | |||
* | merge-blobs.c: fix a memleak | Stefan Beller | 2015-03-23 |
* | Which merge_file() function do you mean? | Junio C Hamano | 2012-12-09 |