Merge branch 'fc/cherry-pick' into integration
authorFelipe Contreras <felipe.contreras@gmail.com>
Wed, 18 May 2016 21:03:46 +0000 (16:03 -0500)
committerFelipe Contreras <felipe.contreras@gmail.com>
Wed, 18 May 2016 21:03:46 +0000 (16:03 -0500)
commit01dd7301c0fc724ebdd9f84d2f734504abb6a7e8
treeea836eb39ed8ec485f8983cf07b921a5b5dfb2d8
parentcf8fe8da31d5243aed7fc965577e179bc6dc49a7
parentb855895928e05437f67cd4565bac901a45ee6147
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
Documentation/config.txt
Documentation/git-cherry-pick.txt
Makefile
builtin/commit.c