aboutsummaryrefslogtreecommitdiff
path: root/builtin-merge.c
Commit message (Expand)AuthorAge
* builtin-merge: fix a typo in an error messageAllan Caffee2009-04-27
* builtin-merge.c: allocate correct amount of memoryBrandon Casey2008-10-09
* maint: check return of split_cmdline to avoid bad config stringsDeskin Miller2008-09-24
* merge: fix numerus bugs around "trivial merge" areaJunio C Hamano2008-08-23
* "git-merge": allow fast-forwarding in a stat-dirty treeJunio C Hamano2008-08-20
* Fix merge name generation in "merge in C"Junio C Hamano2008-07-30
* Make non-static functions, that may be static, staticStephan Beyer2008-07-23
* builtin-merge: add missing structure initializationPierre Habouzit2008-07-21
* builtin-merge: give a proper error message for invalid strategies in configMiklos Vajna2008-07-21
* builtin-merge.c: Fix option parsingMichele Ballabio2008-07-20
* Teach 'git merge' that some merge strategies no longer existMiklos Vajna2008-07-20
* Merge branch 'mv/merge-in-c'Junio C Hamano2008-07-15
* Teach merge.log to "git-merge" againJunio C Hamano2008-07-10
* Build in mergeMiklos Vajna2008-07-07
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-16 14:36:53 +0000