| Commit message (Expand) | Author | Age |
* | Merge branch 'mv/merge-noff' | Junio C Hamano | 2008-10-19 |
|\ |
|
| * | builtin-commit: use reduce_heads() only when appropriate | Miklos Vajna | 2008-10-03 |
* | | Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer | Brandon Casey | 2008-10-12 |
* | | Merge branch 'mv/merge-refresh' | Shawn O. Pearce | 2008-10-09 |
|\ \ |
|
| * | | builtin-merge: refresh the index before calling a strategy | Miklos Vajna | 2008-10-03 |
| |/ |
|
* | | Merge branch 'maint' | Shawn O. Pearce | 2008-10-09 |
|\ \ |
|
| * | | builtin-merge.c: allocate correct amount of memory | Brandon Casey | 2008-10-09 |
* | | | Replace xmalloc/memset(0) pairs with xcalloc | Brandon Casey | 2008-10-08 |
| |/
|/| |
|
* | | Merge branch 'mv/merge-recursive' | Shawn O. Pearce | 2008-09-25 |
|\ \ |
|
| * | | builtin-merge: release the lockfile in try_merge_strategy() | Miklos Vajna | 2008-09-06 |
| * | | builtin-merge: avoid run_command_v_opt() for recursive and subtree | Miklos Vajna | 2008-08-30 |
* | | | Merge branch 'mv/commit-tree' | Shawn O. Pearce | 2008-09-25 |
|\ \ \ |
|
| * | | | commit_tree(): add a new author parameter | Miklos Vajna | 2008-09-10 |
| |/ / |
|
* | | | Merge branch 'maint' | Shawn O. Pearce | 2008-09-25 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | maint: check return of split_cmdline to avoid bad config strings | Deskin Miller | 2008-09-24 |
* | | Remove useless memset of static command name lists in builtin-merge.c | Alex Riesen | 2008-08-28 |
* | | Remove calculation of the longest command name from where it is not used | Alex Riesen | 2008-08-28 |
* | | Merge branch 'mv/merge-custom' | Junio C Hamano | 2008-08-27 |
|\ \ |
|
| * | | Fix "git-merge -s bogo" help text | Junio C Hamano | 2008-08-20 |
| * | | builtin-merge: allow using a custom strategy | Miklos Vajna | 2008-07-29 |
* | | | Merge branch 'maint' to sync with 1.6.0.1 | Junio C Hamano | 2008-08-24 |
|\ \ \
| | |/
| |/| |
|
| * | | merge: fix numerus bugs around "trivial merge" area | Junio C Hamano | 2008-08-23 |
* | | | provide more errors for the "merge into empty head" case | Paolo Bonzini | 2008-08-21 |
|/ / |
|
* | | "git-merge": allow fast-forwarding in a stat-dirty tree | Junio C Hamano | 2008-08-20 |
* | | Fix merge name generation in "merge in C" | Junio C Hamano | 2008-07-30 |
|/ |
|
* | Make non-static functions, that may be static, static | Stephan Beyer | 2008-07-23 |
* | builtin-merge: add missing structure initialization | Pierre Habouzit | 2008-07-21 |
* | builtin-merge: give a proper error message for invalid strategies in config | Miklos Vajna | 2008-07-21 |
* | builtin-merge.c: Fix option parsing | Michele Ballabio | 2008-07-20 |
* | Teach 'git merge' that some merge strategies no longer exist | Miklos Vajna | 2008-07-20 |
* | Merge branch 'mv/merge-in-c' | Junio C Hamano | 2008-07-15 |
* | Teach merge.log to "git-merge" again | Junio C Hamano | 2008-07-10 |
* | Build in merge | Miklos Vajna | 2008-07-07 |