berry-pick: code style fix
berry-pick: add --edit option
berry-pick: code style fix