From: Christian Couder <chriscool@tuxfamily.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Jeff King <peff@peff.net>,
Jakub Narebski <jnareb@gmail.com>,
Eric Sunshine <sunshine@sunshineco.com>
Subject: [PATCH v2 0/4] Add --graft option to git replace
Date: Sun, 01 Jun 2014 17:10:33 +0200 [thread overview]
Message-ID: <20140601150409.15428.27017.chriscool@tuxfamily.org> (raw)
Here is a small patch series to implement:
git replace [-f] --graft <commit> [<parent>...]
This patch series goes on top of the patch series that
implements --edit.
The changes since v1 are the following thanks to Eric,
Junio and Peff:
- change commit message of patch 1/4
- added patch 4/4 that was previously sent separately
- in patch 4/4 rename the existing grafts file
into grafts.bak
Christian Couder (4):
replace: add --graft option
replace: add test for --graft
Documentation: replace: add --graft option
contrib: add convert-grafts-to-replace-refs.sh
Documentation/git-replace.txt | 10 ++++
builtin/replace.c | 84 ++++++++++++++++++++++++++++++-
contrib/convert-grafts-to-replace-refs.sh | 29 +++++++++++
t/t6050-replace.sh | 12 +++++
4 files changed, 134 insertions(+), 1 deletion(-)
create mode 100755 contrib/convert-grafts-to-replace-refs.sh
--
2.0.0.rc0.40.gd30ccc4
next reply other threads:[~2014-06-01 15:11 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-01 15:10 Christian Couder [this message]
2014-06-01 15:10 ` [PATCH v2 1/4] replace: add --graft option Christian Couder
2014-06-01 15:10 ` [PATCH v2 2/4] replace: add test for --graft Christian Couder
2014-06-01 15:10 ` [PATCH v2 3/4] Documentation: replace: add --graft option Christian Couder
2014-06-01 15:10 ` [PATCH v2 4/4] contrib: add convert-grafts-to-replace-refs.sh Christian Couder
2014-06-01 19:42 ` Eric Sunshine
2014-06-02 19:16 ` Christian Couder
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=20140601150409.15428.27017.chriscool@tuxfamily.org \
--to=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jnareb@gmail.com \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.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).