summaryrefslogtreecommitdiff
path: root/builtin/merge-recursive.c
AgeCommit message (Expand)AuthorFilesLines
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-06merge-recursive --renormalizeLibravatar Jonathan Nieder1-0/+4
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLibravatar Linus Torvalds1-0/+84