aboutsummaryrefslogtreecommitdiffstats
path: root/builtin-merge.c
AgeCommit message (Expand)AuthorFilesLines
2008-07-30Fix merge name generation in "merge in C"Junio C Hamano1-2/+2
2008-07-23Make non-static functions, that may be static, staticStephan Beyer1-1/+1
2008-07-21builtin-merge: add missing structure initializationPierre Habouzit1-0/+1
2008-07-21builtin-merge: give a proper error message for invalid strategies in configMiklos Vajna1-25/+12
2008-07-20builtin-merge.c: Fix option parsingMichele Ballabio1-2/+3
2008-07-20Teach 'git merge' that some merge strategies no longer existMiklos Vajna1-2/+0
2008-07-15Merge branch 'mv/merge-in-c'Junio C Hamano1-0/+1156
2008-07-10Teach merge.log to "git-merge" againJunio C Hamano1-0/+2
2008-07-07Build in mergeMiklos Vajna1-0/+1153