Merge branch 'fc/cherry-pick' into integration
* fc/cherry-pick:
cherry-pick: copy notes and run hooks
cherry-pick: add --action-name option
builtin: rewrite: add copy_rewrite_notes()
builtin: move run_rewrite_hook() to rewrite.c
cherry-pick: don't store skipped commit
cherry-pick: store rewritten commits
builtin: add rewrite helper
cherry-pick: remember rerere-autoupdate
revert/cherry-pick: cleanup rerere info on --abort
revert/cherry-pick: add --skip option
revert/cherry-pick: add --quiet option
cherry-pick: add --skip-empty option
cherry-pick: don't barf when there's nothing to do