Dropping post-checkout-rebase in favor of pull that does -i-p right.