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 v4 0/4] Add --graft option to git replace
Date: Fri, 06 Jun 2014 22:25:31 +0200 [thread overview]
Message-ID: <20140606201741.3722.96819.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 v3, thanks to Junio, are:
- remove function read_sha1_commit() and its call as well as a
call to parse_commit_buffer(), as lookup_commit_or_die()
already reads the commit buffer and parses it (patch 1/4)
- source git-sh-setup and other small cosmetic changes in
convert-grafts-to-replace-refs.sh (patch 4/4)
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 | 62 ++++++++++++++++++++++++++++++-
contrib/convert-grafts-to-replace-refs.sh | 28 ++++++++++++++
t/t6050-replace.sh | 12 ++++++
4 files changed, 111 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-07 6:44 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-06 20:25 Christian Couder [this message]
2014-06-06 20:25 ` [PATCH v4 1/4] replace: add --graft option Christian Couder
2014-06-06 20:25 ` [PATCH v4 2/4] replace: add test for --graft Christian Couder
2014-06-06 20:25 ` [PATCH v4 3/4] Documentation: replace: add --graft option Christian Couder
2014-06-06 20:25 ` [PATCH v4 4/4] contrib: add convert-grafts-to-replace-refs.sh 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=20140606201741.3722.96819.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).