From: Jeff King Date: Thu, 16 Jun 2011 20:13:00 GMT Subject: Re: rewrite history Message-ID: <20110616201300.GA14674@sigill.intra.peff.net> 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