summaryrefslogtreecommitdiff
path: root/builtin-merge.c
AgeCommit message (Expand)Author
2008-08-29Remove useless memset of static command name lists in builtin-merge.cAlex Riesen
2008-08-29Remove calculation of the longest command name from where it is not usedAlex Riesen
2008-08-28Merge branch 'mv/merge-custom'Junio C Hamano
2008-08-24Merge branch 'maint' to sync with 1.6.0.1Junio C Hamano
2008-08-24merge: fix numerus bugs around "trivial merge" areaJunio C Hamano
2008-08-22provide more errors for the "merge into empty head" casePaolo Bonzini
2008-08-21Fix "git-merge -s bogo" help textJunio C Hamano
2008-08-20"git-merge": allow fast-forwarding in a stat-dirty treeJunio C Hamano
2008-07-30Fix merge name generation in "merge in C"Junio C Hamano
2008-07-30builtin-merge: allow using a custom strategyMiklos Vajna
2008-07-24Make non-static functions, that may be static, staticStephan Beyer
2008-07-22builtin-merge: add missing structure initializationPierre Habouzit
2008-07-22builtin-merge: give a proper error message for invalid strategies in configMiklos Vajna
2008-07-20builtin-merge.c: Fix option parsingMichele Ballabio
2008-07-20Teach 'git merge' that some merge strategies no longer existMiklos Vajna
2008-07-16Merge branch 'mv/merge-in-c'Junio C Hamano
2008-07-10Teach merge.log to "git-merge" againJunio C Hamano
2008-07-08Build in mergeMiklos Vajna
generated by cgit v0.10.2-6-g49f6 at 2024-04-18 00:10:50 (GMT)