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

Re: Converting merge to rebase in the presence of conflicts

From
Johannes Sixt <j.sixt@viscovery.net>
Date
Apr 11, 2011, 15:03 UTC
Message-ID
<4DA3182B.2030305@viscovery.net>
In-Reply-To
<BANLkTi=krC6JMEWj=a5CY1vRCcmh9b+BaQ@mail.gmail.com>
Am 4/11/2011 16:13, schrieb Hrvoje Nikšić:
> Is there a way to rebase the branch without redoing conflict
> resolution?
git config --global rerere.enabled true
-- Hannes
Previous: Michael J GruberNext: Hrvoje Nikšić
Message 3 of 6 in “Converting merge to rebase in the presence of conflicts”
  1. Hrvoje NikšićApr 11, 2011
  2. Michael J GruberApr 11, 2011
  3. Johannes SixtApr 11, 2011
  4. Hrvoje NikšićApr 11, 2011
  5. Michael HaggertyApr 12, 2011
  6. Johannes SixtApr 12, 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.