Use p instead of pick when rebasing