summaryrefslogtreecommitdiff
path: root/builtin/merge-recursive.c
AgeCommit message (Expand)AuthorFilesLines
2013-12-05replace {pre,suf}fixcmp() with {starts,ends}_with()Libravatar Christian Couder1-2/+2
2011-03-22Fix sparse warningsLibravatar Stephen Boyd1-1/+1
2010-10-26Merge branch 'jf/merge-ignore-ws'Libravatar Junio C Hamano1-13/+2
2010-09-03Merge branch 'jn/merge-renormalize'Libravatar Junio C Hamano1-0/+4
2010-09-03builtin/merge_recursive.c: Add an usage string and make use of it.Libravatar Thiago Farina1-1/+4
2010-08-26merge-recursive --patienceLibravatar Justin Frankel1-0/+1
2010-08-26merge-recursive: expose merge options for builtin mergeLibravatar Jonathan Nieder1-13/+1
2010-08-06merge-recursive --renormalizeLibravatar Jonathan Nieder1-0/+4
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLibravatar Linus Torvalds1-0/+84