Merge branch 'js/cherry-pick-usability'
commit66ecd2d05306fccc65e8d6a5f49100840ea7d3b6
authorJunio C Hamano <gitster@pobox.com>
Wed, 9 Mar 2011 23:56:17 +0000 (9 15:56 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 9 Mar 2011 23:56:17 +0000 (9 15:56 -0800)
tree159eaf1f118e602f3a397ede9dc2b386a96b627a
parent75618f1106b95defafca698d5cfdfd3dfb3a7e3c
parent37f7a8579363a98efc48dfb6964a519034fc9acc
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
Documentation/git-cherry-pick.txt
Documentation/git-commit.txt
builtin/commit.c
builtin/merge.c
builtin/revert.c
wt-status.c