summaryrefslogtreecommitdiff
path: root/match-trees.c
Commit message (Expand)AuthorAgeFilesLines
* convert "oidcmp() != 0" to "!oideq()"Jeff King2018-08-291-1/+1
* Merge branch 'jk/merge-subtree-heuristics'Junio C Hamano2018-08-171-17/+26
|\
| * score_trees(): fix iteration over trees with missing entriesJeff King2018-08-021-17/+26
* | object-store: move object access functions to object-store.hStefan Beller2018-05-161-0/+1
* | sha1_file: convert read_sha1_file to struct object_idbrian m. carlson2018-03-141-2/+2
* | tree-walk: convert tree entry functions to object_idbrian m. carlson2018-03-141-3/+3
* | sha1_file: convert write_sha1_file to object_idPatryk Obara2018-01-301-1/+1
* | match-trees: convert splice_tree to object_idPatryk Obara2018-01-301-24/+22
|/
* match-trees: convert several leaf functions to use struct object_idbrian m. carlson2016-04-251-15/+15
* tree-walk: convert tree_entry_extract() to use struct object_idbrian m. carlson2016-04-251-6/+6
* struct name_entry: use struct object_id instead of unsigned char sha1[20]brian m. carlson2016-04-251-1/+1
* match-trees: convert shift_tree() and shift_tree_by() to use object_idbrian m. carlson2016-04-191-22/+22
* use xstrfmt to replace xmalloc + sprintfJeff King2014-06-191-7/+2
* use strchrnul() in place of strchr() and strlen()rm/strchrnul-not-strlenRohit Mani2014-03-101-7/+4
* match-trees: factor out fill_tree_desc_strictRené Scharfe2013-06-131-25/+19
* match-trees: simplify score_trees() using tree_entry()René Scharfe2013-03-251-40/+28
* Make "subtree" part more orthogonal to the rest of merge-recursive.Junio C Hamano2010-01-171-1/+68
* Improved const correctness for stringsShawn O. Pearce2007-10-211-1/+1
* War on whitespaceJunio C Hamano2007-06-071-1/+0
* A new merge stragety 'subtree'.Junio C Hamano2007-04-071-0/+304