From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 9 Mar 2011 23:56:17 +0000 (-0800)
Subject: Merge branch 'js/cherry-pick-usability'
X-Git-Tag: v1.7.5-rc0~88
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=66ecd2d05306fccc65e8d6a5f49100840ea7d3b6;p=git.git

Merge branch 'js/cherry-pick-usability'

* js/cherry-pick-usability:
  Teach commit about CHERRY_PICK_HEAD
  bash: teach __git_ps1 about CHERRY_PICK_HEAD
  Introduce CHERRY_PICK_HEAD
  t3507: introduce pristine-detach helper
---

66ecd2d05306fccc65e8d6a5f49100840ea7d3b6