From: Christian Couder <chriscool@tuxfamily.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Jeff King <peff@peff.net>,
Michael Haggerty <mhagger@alum.mit.edu>
Subject: [PATCH v1 0/3] Add --graft option to git replace
Date: Thu, 22 May 2014 23:33:03 +0200 [thread overview]
Message-ID: <20140522211836.27162.80311.chriscool@tuxfamily.org> (raw)
Here is a small patch series to implement:
git replace [-f] --graft <commit> [<parent>...]
The changes since the RFC/PATCH are the following:
- in patch 1/3, parse_commit_buffer() is now used to
make sure <commit> is not corrupt
- patch 2/3 add some tests
- patch 3/3 add some documentation
About the documentation, maybe we should add that --graft
can now be used instead of grafts in .git/info/grafts,
and maybe we could add an example that shows how it can
be done.
Christian Couder (3):
replace: add --graft option
replace: add test for --graft
Documentation: replace: add --graft option
Documentation/git-replace.txt | 8 +++++
builtin/replace.c | 84 ++++++++++++++++++++++++++++++++++++++++++-
t/t6050-replace.sh | 12 +++++++
3 files changed, 103 insertions(+), 1 deletion(-)
--
1.9.rc0.17.g651113e
next reply other threads:[~2014-05-23 5:09 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-22 21:33 Christian Couder [this message]
2014-05-22 21:33 ` [PATCH v1 1/3] replace: add --graft option Christian Couder
2014-05-23 19:27 ` Junio C Hamano
2014-05-23 19:51 ` Jeff King
2014-05-23 20:05 ` Junio C Hamano
2014-05-23 20:28 ` Jeff King
2014-05-23 21:22 ` Junio C Hamano
2014-05-23 22:59 ` Eric Sunshine
2014-06-01 16:06 ` Christian Couder
2014-05-22 21:33 ` [PATCH v1 2/3] replace: add test for --graft Christian Couder
2014-05-22 21:33 ` [PATCH v1 3/3] Documentation: replace: add --graft option Christian Couder
2014-05-23 17:06 ` Jakub Narębski
2014-05-23 18:26 ` Junio C Hamano
2014-05-23 16:59 ` [PATCH v1 0/3] Add --graft option to git replace Junio C Hamano
2014-05-27 19:05 ` 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=20140522211836.27162.80311.chriscool@tuxfamily.org \
--to=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mhagger@alum.mit.edu \
--cc=peff@peff.net \
/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).