Merge branch 'rt/cherry-pick-status'
commit0e3b378c3ad3d8c5b02c0ab4828ddb9da1a96e57
authorJonathan Nieder <jrnieder@gmail.com>
Mon, 14 Oct 2013 18:08:47 +0000 (14 11:08 -0700)
committerJonathan Nieder <jrnieder@gmail.com>
Mon, 14 Oct 2013 18:08:47 +0000 (14 11:08 -0700)
treefa70609c40815095435afb5101c9e6f83cc88c64
parent865156a7cb72a579c144220204fd7b447ca4e50f
parentbffd8098705ffcfeb267951dcdd4e49dd188a7bb
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