Merge branch 'jk/cherry-pick-docfix'

* jk/cherry-pick-docfix: cherry-pick: fix docs describing handling of empty commits

Junio C Hamano committed Apr 14, 2015 at 10:33 UTC 5a69705968de1fe6cb3923c420514ab8801622dd

No changes.