summaryrefslogtreecommitdiff
path: root/builtin-merge.c
AgeCommit message (Expand)Author
2008-12-05Make some of fwrite/fclose/write/close failures visibleAlex Riesen
2008-11-15Teach/Fix pull/fetch -q/-v optionsTuncer Ayaz
2008-10-19Merge branch 'mv/merge-noff'Junio C Hamano
2008-10-12Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializerBrandon Casey
2008-10-09Merge branch 'mv/merge-refresh'Shawn O. Pearce
2008-10-09Merge branch 'maint'Shawn O. Pearce
2008-10-09builtin-merge.c: allocate correct amount of memoryBrandon Casey
2008-10-08Replace xmalloc/memset(0) pairs with xcallocBrandon Casey
2008-10-03builtin-commit: use reduce_heads() only when appropriateMiklos Vajna
2008-10-03builtin-merge: refresh the index before calling a strategyMiklos Vajna
2008-09-25Merge branch 'mv/merge-recursive'Shawn O. Pearce
2008-09-25Merge branch 'mv/commit-tree'Shawn O. Pearce
2008-09-25Merge branch 'maint'Shawn O. Pearce
2008-09-24maint: check return of split_cmdline to avoid bad config stringsDeskin Miller
2008-09-10commit_tree(): add a new author parameterMiklos Vajna
2008-09-07builtin-merge: release the lockfile in try_merge_strategy()Miklos Vajna
2008-08-31builtin-merge: avoid run_command_v_opt() for recursive and subtreeMiklos Vajna
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