tgif.git - Terin's Improved Git Fork

Age	Commit message (Collapse)	Author	Files	Lines
2007-11-09	rebase: operate on a detached HEAD	Johannes Schindelin	1	-1/+6
	The interactive version of rebase does all the operations on a detached HEAD, so that after a successful rebase, <branch>@{1} is the pre-rebase state. The reflogs of "HEAD" still show all the actions in detail. This teaches the non-interactive version to do the same. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2006-10-27	tests: merge-recursive is usable without Python	Junio C Hamano	1	-6/+0
	Many tests still protected themselves with $no_python; there is no need to do so anymore. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-21	rebase: error out for NO_PYTHON if they use recursive merge	Eric Wong	1	-0/+6
	recursive merge relies on Python, and we can't perform rename-aware merges without the recursive merge. So bail out before trying it. The test won't work w/o recursive merge, either, so skip that, too. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-21	Add renaming-rebase test.	Junio C Hamano	1	-0/+106
	Signed-off-by: Junio C Hamano <junkio@cox.net>