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

	Commit message (Collapse)	Author	Age
*	merge: reword the final message	Junio C Hamano	2011-05-25
\| \| \| \| \| \| \| \| \| \| \| \|	Ever since the merge command was made multi-strategy aware, we said Merge made by octopus. at the end of a session. Reword it to Merge made by the 'octopus' strategy. Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	tests: add missing &&	Jonathan Nieder	2010-11-09
\| \| \| \| \| \| \| \| \| \| \|	Breaks in a test assertion's && chain can potentially hide failures from earlier commands in the chain. Commands intended to fail should be marked with !, test_must_fail, or test_might_fail. The examples in this patch do not require that. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	octopus: reenable fast-forward merges	Stephen Boyd	2009-12-13
\| \| \| \| \| \| \| \| \| \| \|	The fast-forward logic is never being triggered because $common and $MRC are never equivalent. $common is initialized to a commit id by merge-base and MRC is initialized to HEAD. Fix this by initializing $MRC to the commit id for HEAD so that its possible for $MRC and $common to be equal. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	octopus: make merge process simpler to follow	Stephen Boyd	2009-12-13
\| \| \| \| \| \| \| \| \| \|	Its not very easy to understand what heads are being merged given the current output of an octopus merge. Fix this by replacing the sha1 with the (usually) better description in GITHEAD_<SHA1>. Suggested-by: Jari Aalto <jari.aalto@cante.net> Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	tests: use "git xyzzy" form (t7200 - t9001)	Nanako Shiraishi	2008-09-03
\| \| \| \| \| \| \|	Converts tests between t7201-t9001. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	Build in merge	Miklos Vajna	2008-07-07
\| \| \| \| \| \|	Mentored-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	Add new test to ensure git-merge handles more than 25 refs.	Miklos Vajna	2008-06-30
	The old shell version handled only 25 refs but we no longer have this limitation. Add a test to make sure this limitation will not be introduced again in the future. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>