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