summaryrefslogtreecommitdiff
path: root/builtin-merge.c
AgeCommit message (Expand)AuthorFilesLines
2009-04-27builtin-merge: fix a typo in an error messageLibravatar Allan Caffee1-1/+1
2008-10-09builtin-merge.c: allocate correct amount of memoryLibravatar Brandon Casey1-2/+2
2008-09-24maint: check return of split_cmdline to avoid bad config stringsLibravatar Deskin Miller1-0/+2
2008-08-23merge: fix numerus bugs around "trivial merge" areaLibravatar Junio C Hamano1-7/+9
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-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-12 04:37:09 +0000