Merge branch 'rt/cherry-pick-status'

* rt/cherry-pick-status: status: show commit sha1 in "You are currently cherry-picking" message status test: add missing && to <<EOF blocks

Jonathan Nieder committed Oct 14, 2013 at 11:08 UTC 0e3b378c3ad3d8c5b02c0ab4828ddb9da1a96e57

No changes.