summaryrefslogtreecommitdiff
path: root/t/t3401-rebase-partial.sh
AgeCommit message (Collapse)AuthorFilesLines
2006-10-27tests: merge-recursive is usable without PythonLibravatar Junio C Hamano1-4/+1
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-25rebase: allow --merge option to handle patches merged upstreamLibravatar Eric Wong1-1/+12
Enhance t3401-rebase-partial to test with --merge as well as the standard am -3 strategy. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-01-08Add a test for rebase when a change was picked upstreamLibravatar Yann Dirson1-0/+53
This test exercises the standard feature that makes rebase useful. Signed-off-by: Yann Dirson <ydirson@altern.org> Signed-off-by: Junio C Hamano <junkio@cox.net>