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

	Commit message (Collapse)	Author	Age
*	merge-recursive: use strbuf_expand() instead of interpolate()	René Scharfe	2008-11-23
\| \| \| \| \|	Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	git-merge-recursive: learn to honor merge.conflictstyle	Junio C Hamano	2008-08-30
\| \| \| \| \| \| \| \|	This teaches the low-level ll_xdl_merge() routine to honor merge.conflictstyle configuration variable, so that merge-recursive strategy can show the conflicts in the style of user's choice. Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	Provide git_config with a callback-data parameter	Johannes Schindelin	2008-05-14
\| \| \| \| \| \| \| \| \| \| \| \|	git_config() only had a function parameter, but no callback data parameter. This assumes that all callback functions only modify global variables. With this patch, every callback gets a void * parameter, and it is hoped that this will help the libification effort. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	merge-recursive: split low-level merge functions out.	Junio C Hamano	2008-02-18
	This moves low-level merge functions out of merge-recursive.c and places them in a new separate file, ll-merge.c Signed-off-by: Junio C Hamano <gitster@pobox.com>