From: Jay Soffian Date: Wed, 16 Feb 2011 10:08:21 GMT Subject: [PATCH 0/2] CHERRY_PICK_HEAD Message-ID: <1297850903-65038-1-git-send-email-jaysoffian@gmail.com> Re-roll of http://thread.gmane.org/gmane.comp.version-control.git/166878 If not ready for inclusion, hopefully very close. Jay Soffian (2): Introduce CHERRY_PICK_HEAD 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 | 136 ++++++++++++++++++++++---------- builtin/merge.c | 7 ++ builtin/revert.c | 68 ++++------------ contrib/completion/git-completion.bash | 2 + t/t3507-cherry-pick-conflict.sh | 22 +++++- t/t7509-commit.sh | 29 +++++++ wt-status.c | 4 +- wt-status.h | 8 ++- 12 files changed, 204 insertions(+), 104 deletions(-) -- 1.7.4.1.28.gd46b3