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

rewrite history

From
IBIlya Basin <basinilya@gmail.com>
Date
Jun 16, 2011, 19:17 UTC
Message-ID
<362053118.20110616231758@gmail.com>

Hi list. There were 2 branches. One's HEAD was modified to match a specific commit at another branch. Now, how to merge them according to this scheme?

A---B---X---E---F
                     =>  C---D---X---E---F
C---D---X'

X and X' have no difference. I tried to write a script to cherry-pick E and F, but some of commits are merges and cherry-pick fails.

Next: Jeff King
Message 1 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.