summaryrefslogtreecommitdiff
path: root/builtin-merge.c
Commit message (Expand)AuthorAgeFilesLines
* Teach @{-1} to git mergeJunio C Hamano2009-02-131-3/+12
* Replace deprecated dashed git commands in usageAlexander Potashev2009-02-041-2/+2
* Move run_hook() from builtin-commit.c into run-command.c (libgit)Stephan Beyer2009-01-171-30/+1
* Make some of fwrite/fclose/write/close failures visibleAlex Riesen2008-12-041-2/+4
* Teach/Fix pull/fetch -q/-v optionsTuncer Ayaz2008-11-141-7/+14
* Merge branch 'mv/merge-noff'Junio C Hamano2008-10-191-0/+10
|\
| * builtin-commit: use reduce_heads() only when appropriateMiklos Vajna2008-10-031-0/+10
* | Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializerBrandon Casey2008-10-121-18/+9
* | Merge branch 'mv/merge-refresh'Shawn O. Pearce2008-10-091-0/+10
|\ \
| * | builtin-merge: refresh the index before calling a strategyMiklos Vajna2008-10-031-0/+10
| |/
* | Merge branch 'maint'Shawn O. Pearce2008-10-091-2/+2
|\ \
| * | builtin-merge.c: allocate correct amount of memoryBrandon Casey2008-10-091-2/+2
* | | Replace xmalloc/memset(0) pairs with xcallocBrandon Casey2008-10-081-2/+1
| |/ |/|
* | Merge branch 'mv/merge-recursive'Shawn O. Pearce2008-09-251-29/+64
|\ \
| * | builtin-merge: release the lockfile in try_merge_strategy()Miklos Vajna2008-09-061-0/+1
| * | builtin-merge: avoid run_command_v_opt() for recursive and subtreeMiklos Vajna2008-08-301-29/+63
* | | Merge branch 'mv/commit-tree'Shawn O. Pearce2008-09-251-2/+2
|\ \ \
| * | | commit_tree(): add a new author parameterMiklos Vajna2008-09-101-2/+2
| |/ /
* | | Merge branch 'maint'Shawn O. Pearce2008-09-251-0/+2
|\ \ \ | |/ / |/| / | |/
| * maint: check return of split_cmdline to avoid bad config stringsDeskin Miller2008-09-241-0/+2
* | Remove useless memset of static command name lists in builtin-merge.cAlex Riesen2008-08-281-2/+0
* | Remove calculation of the longest command name from where it is not usedAlex Riesen2008-08-281-4/+4
* | Merge branch 'mv/merge-custom'Junio C Hamano2008-08-271-7/+43
|\ \
| * | Fix "git-merge -s bogo" help textJunio C Hamano2008-08-201-3/+11
| * | builtin-merge: allow using a custom strategyMiklos Vajna2008-07-291-7/+35
* | | Merge branch 'maint' to sync with 1.6.0.1Junio C Hamano2008-08-241-7/+9
|\ \ \ | | |/ | |/|
| * | merge: fix numerus bugs around "trivial merge" areaJunio C Hamano2008-08-231-7/+9
* | | provide more errors for the "merge into empty head" casePaolo Bonzini2008-08-211-0/+5
|/ /
* | "git-merge": allow fast-forwarding in a stat-dirty treeJunio C Hamano2008-08-201-1/+1
* | Fix merge name generation in "merge in C"Junio C Hamano2008-07-301-2/+2
|/
* Make non-static functions, that may be static, staticStephan Beyer2008-07-231-1/+1
* builtin-merge: add missing structure initializationPierre Habouzit2008-07-211-0/+1
* builtin-merge: give a proper error message for invalid strategies in configMiklos Vajna2008-07-211-25/+12
* builtin-merge.c: Fix option parsingMichele Ballabio2008-07-201-2/+3
* Teach 'git merge' that some merge strategies no longer existMiklos Vajna2008-07-201-2/+0
* Merge branch 'mv/merge-in-c'Junio C Hamano2008-07-151-0/+1
* Teach merge.log to "git-merge" againJunio C Hamano2008-07-101-0/+2
* Build in mergeMiklos Vajna2008-07-071-0/+1153
View Lorry Controller Status