org/kernel/git.git - forked from git/git

	Commit message (Expand)	Author	Age
*	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