rebase: use peel_committish() where appropriate