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

Re: [PATCH] pull: Allow pull to preserve merges when rebasing.

From
Stephen Haberman <stephen@exigencecorp.com>
Date
Aug 9, 2013, 15:28 UTC
Message-ID
<20130809102827.3c5d09fa@sh9>
In-Reply-To
<alpine.DEB.1.00.1308091618530.24252@s15462909.onlinehome-server.info>
> We have a patch in Git for Windows allowing rebase = interactive
> which I did not have time to send upstream.

Cool, so, would rebase=preserve and rebase=interactive be completely orthogonal?

E.g. do we have to worry about the user wanting to do both, like with something ugly like rebase=preserve-interactive?

Assuming not, rebase=preserve sounds good to me. I have a patch that does that about ready to submit.

- Stephen
Previous: Johannes Schindelin
Message 9 of 9 in “[RFC] allow git pull to preserve merges”
  1. Stephen HabermanAug 8, 2013
  2. pull: Allow pull to preserve merges when rebasing.Stephen Haberman, Aug 8, 2013
  3. Stephen HabermanAug 8, 2013
  4. Johannes SchindelinAug 8, 2013
  5. Stephen HabermanAug 8, 2013
  6. Philip OakleyAug 8, 2013
  7. Junio C HamanoAug 8, 2013
  8. Johannes SchindelinAug 9, 2013
  9. Stephen HabermanAug 9, 2013

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.