git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: rewrite history

From
Jeff King <peff@peff.net>
Date
Jun 16, 2011, 20:13 UTC
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:
Show 7 quoted lines
> 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
Previous: Ilya BasinNext: Ilya Basin
Message 6 of 9 in “rewrite history”
  1. Ilya BasinJun 16, 2011
  2. Jeff KingJun 16, 2011
  3. Junio C HamanoJun 16, 2011
  4. Jeff KingJun 16, 2011
  5. Re[2]: rewrite historyIlya Basin, Jun 16, 2011
  6. Jeff KingJun 16, 2011
  7. Re[2]: rewrite historyIlya Basin, Jun 16, 2011
  8. Re[3]: rewrite historyIlya Basin, Jun 16, 2011
  9. Marc BranchaudJun 16, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.