From: Jay Soffian <jaysoffian@gmail.com>
To: git@vger.kernel.org
Cc: "Jay Soffian" <jaysoffian@gmail.com>,
"Jonathan Nieder" <jrnieder@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH v3 0/4] CHERRY_PICK_HEAD
Date: Wed, 16 Feb 2011 23:18:41 -0500 [thread overview]
Message-ID: <1297916325-89688-1-git-send-email-jaysoffian@gmail.com> (raw)
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(-)
--
1.7.4.1.30.g7fe09
next reply other threads:[~2011-02-17 4:19 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-17 4:18 Jay Soffian [this message]
2011-02-17 4:18 ` [PATCH v3 1/4] Introduce CHERRY_PICK_HEAD Jay Soffian
2011-02-17 20:01 ` Junio C Hamano
2011-02-17 22:32 ` Jonathan Nieder
2011-02-20 2:29 ` Jay Soffian
2011-02-20 2:48 ` Jonathan Nieder
2011-02-20 6:43 ` Junio C Hamano
2011-02-17 21:56 ` Junio C Hamano
2011-02-17 22:42 ` Jay Soffian
2011-02-17 22:48 ` Jonathan Nieder
2011-02-17 4:18 ` [PATCH v3 2/4] bash: teach __git_ps1 about CHERRY_PICK_HEAD Jay Soffian
2011-02-17 4:18 ` [PATCH v3 3/4] commit.c: replace some literal strings with constants Jay Soffian
2011-02-17 5:19 ` Jonathan Nieder
2011-02-17 5:50 ` [PATCH] Teach commit about CHERRY_PICK_HEAD Jay Soffian
2011-02-18 0:29 ` Jonathan Nieder
2011-02-17 5:49 ` [PATCH v3 3/4] commit.c: replace some literal strings with constants Junio C Hamano
2011-02-17 4:18 ` [PATCH v3 4/4] Teach commit about CHERRY_PICK_HEAD 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=1297916325-89688-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).