Fix the rebasing with an external command