summaryrefslogtreecommitdiff
path: root/builtin-merge.c
AgeCommit message (Expand)AuthorFilesLines
2008-09-06builtin-merge: release the lockfile in try_merge_strategy()Libravatar Miklos Vajna1-0/+1
2008-08-30builtin-merge: avoid run_command_v_opt() for recursive and subtreeLibravatar Miklos Vajna1-29/+63
2008-08-28Remove useless memset of static command name lists in builtin-merge.cLibravatar Alex Riesen1-2/+0
2008-08-28Remove calculation of the longest command name from where it is not usedLibravatar Alex Riesen1-4/+4
2008-08-27Merge branch 'mv/merge-custom'Libravatar Junio C Hamano1-7/+43
2008-08-24Merge branch 'maint' to sync with 1.6.0.1Libravatar Junio C Hamano1-7/+9
2008-08-23merge: fix numerus bugs around "trivial merge" areaLibravatar Junio C Hamano1-7/+9
2008-08-21provide more errors for the "merge into empty head" caseLibravatar Paolo Bonzini1-0/+5
2008-08-20Fix "git-merge -s bogo" help textLibravatar Junio C Hamano1-3/+11
2008-08-20"git-merge": allow fast-forwarding in a stat-dirty treeLibravatar Junio C Hamano1-1/+1
2008-07-30Fix merge name generation in "merge in C"Libravatar Junio C Hamano1-2/+2
2008-07-29builtin-merge: allow using a custom strategyLibravatar Miklos Vajna1-7/+35
2008-07-23Make non-static functions, that may be static, staticLibravatar Stephan Beyer1-1/+1
2008-07-21builtin-merge: add missing structure initializationLibravatar Pierre Habouzit1-0/+1
2008-07-21builtin-merge: give a proper error message for invalid strategies in configLibravatar Miklos Vajna1-25/+12
2008-07-20builtin-merge.c: Fix option parsingLibravatar Michele Ballabio1-2/+3
2008-07-20Teach 'git merge' that some merge strategies no longer existLibravatar Miklos Vajna1-2/+0
2008-07-15Merge branch 'mv/merge-in-c'Libravatar Junio C Hamano1-0/+1156
2008-07-10Teach merge.log to "git-merge" againLibravatar Junio C Hamano1-0/+2
2008-07-07Build in mergeLibravatar Miklos Vajna1-0/+1153
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 11:24:15 +0000