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

	Commit message (Expand)	Author	Age
*	Merge branch 'maint-1.6.2' into maint	Junio C Hamano	2009-06-20
\|\
\| *	Merge branch 'maint-1.6.0' into maint-1.6.1	Junio C Hamano	2009-06-20
\| \|\
\| \| *	use xstrdup, not strdup in ll-merge.c	Jim Meyering	2009-06-14
* \| \|	replace direct calls to unlink(2) with unlink_or_warn	Alex Riesen	2009-04-29
\|/ /
* \|	merge-recursive: use strbuf_expand() instead of interpolate()	René Scharfe	2008-11-23
* \|	git-merge-recursive: learn to honor merge.conflictstyle	Junio C Hamano	2008-08-30
\|/
*	Provide git_config with a callback-data parameter	Johannes Schindelin	2008-05-14
*	merge-recursive: split low-level merge functions out.	Junio C Hamano	2008-02-18