rebase--am: use --cherry-pick instead of --ignore-if-in-upstream