4 commits

Author	SHA1	Message	Date
Johannes Schindelin	6fd2f5e60d	rebase: operate on a detached HEAD ... 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>	2007-11-09 01:30:31 -08:00
Junio C Hamano	36889a5078	tests: merge-recursive is usable without Python ... 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-10-27 14:29:55 -07:00
Eric Wong	693c15dc28	rebase: error out for NO_PYTHON if they use recursive merge ... 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 03:56:30 -07:00
Junio C Hamano	c3fb0e358e	Add renaming-rebase test. ... Signed-off-by: Junio C Hamano <junkio@cox.net>	2006-06-21 03:56:29 -07:00