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 8, 2013, 21:35 UTC
Message-ID
<20130808163539.0b59b20a@sh9>
In-Reply-To
<alpine.DEB.1.00.1308082314320.24252@s15462909.onlinehome-server.info>
Hi Johannes,
> This should probably be added to config.txt and
> Documentation/git-pull.txt, too, right?

Yep, I meant to note that I'd do that after getting an initial confirmation that the pull.preserve-merges was the preferred approach.

(I was being lazy and didn't want to write up docs only to switch to overloading pull.rebase or what not.)

But I'll go ahead and do that.
> 	https://github.com/msysgit/git/commit/b733454b
Interesting!
> Feel free to play with it if you want!

I'll poke around out of curiosity, but no promises, as, yes, this is a tricky bit of functionality that can quickly lead to a lot of lost sleep. :-)

- Stephen
Previous: Johannes SchindelinNext: Philip Oakley
Message 5 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.