Merge branch 'jc/cherry'

* jc/cherry:
  Documentation: --cherry-pick
  git-log --cherry-pick A...B
  Refactor patch-id filtering out of git-cherry and git-format-patch.
  Add %m to '--pretty=format:'

diff --cc Makefile
Simple merge

diff --cc builtin-log.c
Simple merge

diff --cc revision.c
Simple merge