summaryrefslogtreecommitdiff
path: root/match-trees.c
Commit message (Expand)AuthorAgeFilesLines
* 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