aboutsummaryrefslogtreecommitdiff
path: root/builtin-merge.c
Commit message (Expand)AuthorAge
* Merge branch 'maint'Junio C Hamano2009-04-28
|\
| * Merge branch 'maint-1.6.1' into maintJunio C Hamano2009-04-28
| |\
| | * Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-28
| | |\
| | | * builtin-merge: fix a typo in an error messageAllan Caffee2009-04-27
* | | | strbuf_branchname(): a wrapper for branch name shorthandsJunio C Hamano2009-03-22
* | | | Rename interpret/substitute nth_last_branch functionsJunio C Hamano2009-03-22
* | | | Turn the flags in struct dir_struct into a single variableJohannes Schindelin2009-02-18
|/ / /
* | | Teach @{-1} to git mergeJunio C Hamano2009-02-13
* | | Replace deprecated dashed git commands in usageAlexander Potashev2009-02-04
* | | Move run_hook() from builtin-commit.c into run-command.c (libgit)Stephan Beyer2009-01-17
|/ /
* | Make some of fwrite/fclose/write/close failures visibleAlex Riesen2008-12-04
* | Teach/Fix pull/fetch -q/-v optionsTuncer Ayaz2008-11-14
* | Merge branch 'mv/merge-noff'Junio C Hamano2008-10-19
|\ \
| * | builtin-commit: use reduce_heads() only when appropriateMiklos Vajna2008-10-03
* | | Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializerBrandon Casey2008-10-12
* | | Merge branch 'mv/merge-refresh'Shawn O. Pearce2008-10-09
|\ \ \
| * | | builtin-merge: refresh the index before calling a strategyMiklos Vajna2008-10-03
| |/ /
* | | Merge branch 'maint'Shawn O. Pearce2008-10-09
|\ \ \ | | |/ | |/|
| * | builtin-merge.c: allocate correct amount of memoryBrandon Casey2008-10-09
* | | Replace xmalloc/memset(0) pairs with xcallocBrandon Casey2008-10-08
| |/ |/|
* | Merge branch 'mv/merge-recursive'Shawn O. Pearce2008-09-25
|\ \
| * | builtin-merge: release the lockfile in try_merge_strategy()Miklos Vajna2008-09-06
| * | builtin-merge: avoid run_command_v_opt() for recursive and subtreeMiklos Vajna2008-08-30
* | | Merge branch 'mv/commit-tree'Shawn O. Pearce2008-09-25
|\ \ \
| * | | commit_tree(): add a new author parameterMiklos Vajna2008-09-10
| |/ /
* | | Merge branch 'maint'Shawn O. Pearce2008-09-25
|\ \ \ | |/ / |/| / | |/
| * maint: check return of split_cmdline to avoid bad config stringsDeskin Miller2008-09-24
* | Remove useless memset of static command name lists in builtin-merge.cAlex Riesen2008-08-28
* | Remove calculation of the longest command name from where it is not usedAlex Riesen2008-08-28
* | Merge branch 'mv/merge-custom'Junio C Hamano2008-08-27
|\ \
| * | Fix "git-merge -s bogo" help textJunio C Hamano2008-08-20
| * | builtin-merge: allow using a custom strategyMiklos Vajna2008-07-29
* | | Merge branch 'maint' to sync with 1.6.0.1Junio C Hamano2008-08-24
|\ \ \ | | |/ | |/|
| * | merge: fix numerus bugs around "trivial merge" areaJunio C Hamano2008-08-23
* | | provide more errors for the "merge into empty head" casePaolo Bonzini2008-08-21
|/ /
* | "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