Merge branch 'jk/cherry-pick-docfix' into maint

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

Junio C Hamano committed Apr 21, 2015 at 12:12 UTC c809f4258fb066078b401cfead578a7bb855a2cb

No changes.