delta/git.git - github.com: git/git.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	trailer: add test with an old style conflict blockcc/interpret-trailers-more	Christian Couder	2014-11-10	1	-1/+31
\| \| \| \| \|	Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	trailer: reuse ignore_non_trailer() to ignore conflict lines	Christian Couder	2014-11-10	1	-0/+2
\| \| \| \| \| \| \| \|	Make sure we look for trailers before any conflict line by reusing the ignore_non_trailer() function. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	trailer: add tests for commands in config file	Christian Couder	2014-10-13	1	-0/+125
\| \| \| \| \| \| \|	And add a few other tests for some special cases. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	trailer: add tests for "git interpret-trailers"	Christian Couder	2014-10-13	1	-0/+738
	Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>