Merge branch 'js/cherry-pick-usability' into next
commit95db30e162d7ac8841f6babed28342007e04e7f3
authorJunio C Hamano <gitster@pobox.com>
Wed, 23 Feb 2011 22:23:06 +0000 (23 14:23 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 23 Feb 2011 22:23:06 +0000 (23 14:23 -0800)
tree6bdacc3e654617f1c750ff9579acd596167d1265
parentd754139c48227d3bde1de37166f299c05176622c
parent37f7a8579363a98efc48dfb6964a519034fc9acc
Merge branch 'js/cherry-pick-usability' into next

* 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