From: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon, 14 Oct 2013 18:08:47 +0000 (-0700)
Subject: Merge branch 'rt/cherry-pick-status'
X-Git-Tag: v1.8.5-rc0~61
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0e3b378c3ad3d8c5b02c0ab4828ddb9da1a96e57

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
---

0e3b378c3ad3d8c5b02c0ab4828ddb9da1a96e57