From: Jeff King <peff@peff.net>
To: Ilya Basin <basinilya@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: rewrite history
Date: Thu, 16 Jun 2011 16:13:00 -0400 [thread overview]
Message-ID: <20110616201300.GA14674@sigill.intra.peff.net> (raw)
In-Reply-To: <17721660.20110617000644@gmail.com>
On Fri, Jun 17, 2011 at 12:06:44AM +0400, Ilya Basin wrote:
> JK> I thought that was exactly what Ilya said with "X and X' have no
> JK> difference". I assumed that meant "they are semantically similar commits
> JK> on different bases" (i.e., a cherry-pick) and not "they have the exact
> JK> same tree state" (i.e., "git diff X X'" is empty).
> [...]
> sorry,
> git diff X X' is empty
Oh, then ignore everything I said. :)
I think you want to graft and filter-branch as Junio mentioned.
-Peff
next prev parent reply other threads:[~2011-06-16 20:13 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-16 19:17 rewrite history Ilya Basin
2011-06-16 19:26 ` Jeff King
2011-06-16 19:43 ` Junio C Hamano
2011-06-16 19:49 ` Jeff King
2011-06-16 20:06 ` Re[2]: " Ilya Basin
2011-06-16 20:13 ` Jeff King [this message]
2011-06-16 21:55 ` Ilya Basin
2011-06-16 22:18 ` Re[3]: " Ilya Basin
2011-06-16 21:33 ` Marc Branchaud
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=20110616201300.GA14674@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=basinilya@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).