git - git

	Commit message (Expand)	Author	Age	Files	Lines
*	Remove useless memset of static command name lists in builtin-merge.c	Alex Riesen	2008-08-29	1	-2/+0
*	Remove calculation of the longest command name from where it is not used	Alex Riesen	2008-08-29	1	-4/+4
*	Merge branch 'mv/merge-custom'	Junio C Hamano	2008-08-28	1	-7/+43
\|\
\| *	Fix "git-merge -s bogo" help text	Junio C Hamano	2008-08-21	1	-3/+11
\| *	builtin-merge: allow using a custom strategy	Miklos Vajna	2008-07-30	1	-7/+35
* \|	Merge branch 'maint' to sync with 1.6.0.1	Junio C Hamano	2008-08-24	1	-7/+9
\|\ \
\| * \|	merge: fix numerus bugs around "trivial merge" area	Junio C Hamano	2008-08-24	1	-7/+9
* \| \|	provide more errors for the "merge into empty head" case	Paolo Bonzini	2008-08-22	1	-0/+5
\|/ /
* \|	"git-merge": allow fast-forwarding in a stat-dirty tree	Junio C Hamano	2008-08-21	1	-1/+1
* \|	Fix merge name generation in "merge in C"	Junio C Hamano	2008-07-30	1	-2/+2
\|/
*	Make non-static functions, that may be static, static	Stephan Beyer	2008-07-24	1	-1/+1
*	builtin-merge: add missing structure initialization	Pierre Habouzit	2008-07-22	1	-0/+1
*	builtin-merge: give a proper error message for invalid strategies in config	Miklos Vajna	2008-07-22	1	-25/+12
*	builtin-merge.c: Fix option parsing	Michele Ballabio	2008-07-20	1	-2/+3
*	Teach 'git merge' that some merge strategies no longer exist	Miklos Vajna	2008-07-20	1	-2/+0
*	Merge branch 'mv/merge-in-c'	Junio C Hamano	2008-07-16	1	-0/+1
*	Teach merge.log to "git-merge" again	Junio C Hamano	2008-07-10	1	-0/+2
*	Build in merge	Miklos Vajna	2008-07-08	1	-0/+1153