Incorporating feedback from http://thread.gmane.org/gmane.comp.version-control.git/166945
Jay Soffian (4):
Introduce CHERRY_PICK_HEAD
bash: teach __git_ps1 about CHERRY_PICK_HEAD
commit.c: replace some literal strings with constants
Teach commit about CHERRY_PICK_HEAD
Documentation/git-cherry-pick.txt | 19 +++
Documentation/git-commit.txt | 7 +-
Documentation/revisions.txt | 5 +-
branch.c | 1 +
builtin/commit.c | 196 ++++++++++++++++++++++----------
builtin/merge.c | 7 +
builtin/revert.c | 74 ++++---------
contrib/completion/git-completion.bash | 2 +
t/t3507-cherry-pick-conflict.sh | 138 ++++++++++++++++++++++-
t/t7509-commit.sh | 29 +++++
wt-status.c | 4 +-
wt-status.h | 9 ++-
12 files changed, 371 insertions(+), 120 deletions(-)