cherry-pick: do not error on non-merge commits when '-m 1' is specified