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

Re: [PATCH (fixed)] rebase: Allow merge strategies to be used when rebasing

From
Junio C Hamano <junkio@cox.net>
Date
Jun 21, 2006, 11:01 UTC
Message-ID
<7v4pye22nk.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<11508842824018-git-send-email-normalperson@yhbt.net>
Eric Wong <normalperson@yhbt.net> writes:
> 1 - is fixed for --onto usage.

More importantly, it used to rebase "side edits further" commit incorrectly in the test sequence -- the commit should only touch "newfile", but it touched "renamed" as well. Your updated patch fixes this problem.

Previous: Eric WongNext: Junio C Hamano
Message 9 of 11 in “rebase: Allow merge strategies to be used when rebasing”
  1. rebase: Allow merge strategies to be used when rebasingEric Wong, Jun 18, 2006
  2. Junio C HamanoJun 18, 2006
  3. Eric WongJun 19, 2006
  4. Junio C HamanoJun 19, 2006
  5. Eric WongJun 21, 2006
  6. rebase: Allow merge strategies to be used when rebasingEric Wong, Jun 21, 2006
  7. 1/3 rebase: Allow merge strategies to be used when rebasingEric Wong, Jun 21, 2006
  8. 3/3 rebase: error out for NO_PYTHON if they use recursive mergeEric Wong, Jun 21, 2006
  9. Junio C HamanoJun 21, 2006
  10. Junio C HamanoJun 21, 2006
  11. Add renaming-rebase test.Junio C Hamano, Jun 18, 2006

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.