Rebase: reorder after, pick, pick before