path: root/t/
AgeCommit message (Collapse)Author
2006-06-25rebase: allow --skip to work with --mergeEric Wong
Now that we control the merge base selection, we won't be forced into rolling things in that we wanted to skip beforehand. Also, add a test to ensure this all works as intended. Signed-off-by: Eric Wong <> Signed-off-by: Junio C Hamano <>