From: Christian Couder <chriscool@tuxfamily.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Jeff King <peff@peff.net>
Subject: [PATCH v2 00/10] replace: add option to edit a Git object
Date: Sat, 17 May 2014 08:41:22 +0200 [thread overview]
Message-ID: <20140517062418.18932.21200.chriscool@tuxfamily.org> (raw)
This patch series comes from what Peff sent in the following thread:
http://thread.gmane.org/gmane.comp.version-control.git/243361/focus=243528
The first 4 patches (1/4, 2/4, 3/4 and 4/4) didn't change since v1.
I added 6 more small patches to add tests, documentation and a few
small improvements.
Christian Couder (6):
replace: make sure --edit results in a different object
replace: refactor checking ref validity
replace: die early if replace ref already exists
replace: add tests for --edit
replace: add --edit to usage string
Documentation: replace: describe new --edit option
Jeff King (4):
replace: refactor command-mode determination
replace: use OPT_CMDMODE to handle modes
replace: factor object resolution out of replace_object
replace: add --edit option
Documentation/git-replace.txt | 15 ++-
builtin/replace.c | 225 +++++++++++++++++++++++++++++++++---------
t/t6050-replace.sh | 29 ++++++
3 files changed, 223 insertions(+), 46 deletions(-)
--
1.9.rc0.17.g651113e
next reply other threads:[~2014-05-17 6:43 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-17 6:41 Christian Couder [this message]
2014-05-17 6:41 ` [PATCH v2 01/10] replace: refactor command-mode determination Christian Couder
2014-05-17 6:41 ` [PATCH v2 02/10] replace: use OPT_CMDMODE to handle modes Christian Couder
2014-05-17 6:41 ` [PATCH v2 03/10] replace: factor object resolution out of replace_object Christian Couder
2014-05-17 6:41 ` [PATCH v2 04/10] replace: add --edit option Christian Couder
2014-05-17 6:41 ` [PATCH v2 05/10] replace: make sure --edit results in a different object Christian Couder
2014-05-17 7:03 ` Jeff King
2014-05-17 6:41 ` [PATCH v2 06/10] replace: refactor checking ref validity Christian Couder
2014-05-17 6:41 ` [PATCH v2 07/10] replace: die early if replace ref already exists Christian Couder
2014-05-17 7:05 ` Jeff King
2014-05-17 6:41 ` [PATCH v2 08/10] replace: add tests for --edit Christian Couder
2014-05-17 7:14 ` Jeff King
2014-05-17 6:41 ` [PATCH v2 09/10] replace: add --edit to usage string Christian Couder
2014-05-17 6:41 ` [PATCH v2 10/10] Documentation: replace: describe new --edit option Christian Couder
2014-05-17 7:23 ` Jeff King
2014-05-17 7:24 ` [PATCH v2 00/10] replace: add option to edit a Git object Jeff King
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=20140517062418.18932.21200.chriscool@tuxfamily.org \
--to=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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).