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

	Commit message (Collapse)	Author	Age	Files	Lines
*	merge: use argv_array when spawning merge strategy	Jeff King	2014-06-19	1	-29/+13
\| \| \| \| \| \| \| \|	This is shorter, and avoids a rather complicated set of allocation and free steps. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	Move try_merge_command and checkout_fast_forward to libgit.a	Nguyễn Thái Ngọc Duy	2012-10-29	1	-0/+112
	These functions are called in sequencer.c, which is part of libgit.a. This makes libgit.a potentially require builtin/merge.c for external git commands. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Jeff King <peff@peff.net>