aboutsummaryrefslogtreecommitdiff
path: root/t/t3401-rebase-partial.sh
Commit message (Collapse)AuthorAge
* tests: merge-recursive is usable without PythonJunio C Hamano2006-10-27
| | | | | | | 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>
* rebase: allow --merge option to handle patches merged upstreamEric Wong2006-06-25
| | | | | | | | 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>
* Add a test for rebase when a change was picked upstreamYann Dirson2006-01-08
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>