Use cherry-pick -xe instead of git log amend