From: Jay Soffian <jaysoffian@gmail.com>
To: git@vger.kernel.org
Cc: "Jay Soffian" <jaysoffian@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Jonathan Nieder" <jrnieder@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>
Subject: [PATCH 0/2] CHERRY_PICK_HEAD
Date: Wed, 16 Feb 2011 05:08:21 -0500 [thread overview]
Message-ID: <1297850903-65038-1-git-send-email-jaysoffian@gmail.com> (raw)
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
next reply other threads:[~2011-02-16 10:09 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-16 10:08 Jay Soffian [this message]
2011-02-16 10:08 ` [PATCH 1/2] Introduce CHERRY_PICK_HEAD Jay Soffian
2011-02-16 11:13 ` Nguyen Thai Ngoc Duy
2011-02-16 16:50 ` Jay Soffian
2011-02-16 17:20 ` [PATCH v2] " Jay Soffian
2011-02-16 17:25 ` Jay Soffian
2011-02-16 21:42 ` Jonathan Nieder
2011-02-16 22:13 ` Jay Soffian
2011-02-16 23:02 ` Jonathan Nieder
2011-02-17 19:58 ` Junio C Hamano
2011-02-17 22:16 ` Jonathan Nieder
2011-02-16 10:08 ` [PATCH 2/2] Teach commit about CHERRY_PICK_HEAD Jay Soffian
2011-02-16 21:07 ` Junio C Hamano
2011-02-16 21:33 ` Jay Soffian
2011-02-16 21:55 ` [PATCH 1.5/2] bash: teach __git_ps1 " Jonathan Nieder
2011-02-16 22:49 ` Junio C Hamano
2011-02-16 22:43 ` [PATCH 2/2] Teach commit " Jonathan Nieder
2011-02-17 0:05 ` Jay Soffian
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1297850903-65038-1-git-send-email-jaysoffian@gmail.com \
--to=jaysoffian@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.