[PATCH v4 0/4] CHERRY_PICK_HEAD

[Jay Soffian <jaysoffian@gmail.com>]

As compared to v3:

- Adds pristine-detach to the start of the series. I thought it made sense to
  refactor before adding the additional tests instead of after.

- Fixes t3404#16. This was due to CHERRY_PICK_HEAD overriding the authorship set
  by git rebase --interactive when used with --no-commit. Now we just don't
  write CHERRY_PICK_HEAD when --no-commit is given. This also addresses Junio's
  concern that doing so would be a regression.

  (That said, I wonder if rebase --interactive should use --reset-author when
  committing after using cherry-pick --no-commit just in case.)

- Addresses (I think) the various other feedback given in
  http://thread.gmane.org/gmane.comp.version-control.git/167031

Jay Soffian (3):
  Introduce CHERRY_PICK_HEAD
  bash: teach __git_ps1 about CHERRY_PICK_HEAD
  Teach commit about CHERRY_PICK_HEAD

Jonathan Nieder (1):
  t3507: introduce pristine-detach helper

 Documentation/git-cherry-pick.txt      |   19 ++++
 Documentation/git-commit.txt           |    7 +-
 Documentation/revisions.txt            |    5 +-
 branch.c                               |    1 +
 builtin/commit.c                       |  156 +++++++++++++++++++++++---------
 builtin/merge.c                        |    7 ++
 builtin/revert.c                       |   75 +++++-----------
 contrib/completion/git-completion.bash |    2 +
 t/t3507-cherry-pick-conflict.sh        |  150 ++++++++++++++++++++-----------
 t/t7509-commit.sh                      |   29 ++++++
 wt-status.c                            |    4 +-
 wt-status.h                            |    9 ++-
 12 files changed, 308 insertions(+), 156 deletions(-)

-- 
1.7.4.1.51.g615e0