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

Re: [PATCH] rebase -i -p: use rerere to resolve conflicts if enabled

From
Johannes Sixt <j6t@kdbg.org>
Date
Jun 17, 2012, 18:30 UTC
Message-ID
<4FDE2252.5030802@kdbg.org>
In-Reply-To
<1917D067-6FB3-4393-B178-BBE36B4B5D4E@kilzer.net>
Am 17.06.2012 15:46, schrieb David Kilzer:
Show 6 quoted lines
> If it could be guaranteed that all changes in a merge commit would be
> preserved when running "git rebase -i -p" with rerere.autoupdate
> enabled, I think that would be an argument for not returning control
> to the user during the rebase operation.  However, changes to
> non-conflicted files in a merge commit are currently lost in this
> case, so it would be too dangerous to enable this behavior now.
You can test this patch:
  git://repo.or.cz/git/mingw/j6t.git preserve-merges-by-cherry-pick

I think it suits you needs unless you run into the one use-case where the patch is a regression (as documented by the new test_expect_failure in the test suite).

-- Hannes
Previous: David KilzerNext: David Kilzer
Message 8 of 12 in “rebase -i -p: use rerere to resolve conflicts if enabled”
  1. rebase -i -p: use rerere to resolve conflicts if enabledDavid D. Kilzer, Jun 15, 2012
  2. Junio C HamanoJun 15, 2012
  3. David KilzerJun 16, 2012
  4. Junio C HamanoJun 16, 2012
  5. David KilzerJun 17, 2012
  6. Junio C HamanoJun 17, 2012
  7. David KilzerJun 17, 2012
  8. Johannes SixtJun 17, 2012
  9. David KilzerJun 17, 2012
  10. Johannes SixtJun 18, 2012
  11. Junio C HamanoJun 17, 2012
  12. Junio C HamanoJun 17, 2012

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.