git - git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'maint-1.6.0' into maint-1.6.1	Junio C Hamano	2009-06-21	1	-4/+4
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	* maint-1.6.0: git-show-ref.txt: remove word and make consistent git-svn documentation: fix typo in 'rebase vs. pull/merge' section use xstrdup, not strdup in ll-merge.c
\| *	use xstrdup, not strdup in ll-merge.c	Jim Meyering	2009-06-14	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Otherwise, a fluky allocation failure would cause merge configuration settings to be silently ignored. Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* \|	merge-recursive: use strbuf_expand() instead of interpolate()	René Scharfe	2008-11-24	1	-12/+9
\| \| \| \| \| \| \| \| \| \|	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-31	1	-5/+13
\|/ \| \| \| \| \| \| \|	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	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+379
	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>