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

pull --preserve-merges

From
Stephen Haberman <stephen@exigencecorp.com>
Date
Nov 7, 2008, 22:01 UTC
Message-ID
<20081107160138.aa96405c.stephen@exigencecorp.com>
Hi,

Awhile ago I brought up wanting to have a "rebase with preserve merges" option for `git pull`:

http://thread.gmane.org/gmane.comp.version-control.git/96513

Andreas had a patch to help by supporting manually typing out `git pull --rebase --preserve-merges`:

http://thread.gmane.org/gmane.comp.version-control.git/96593

And then I did another small copy/paste patch on top to add a config setting of `branch.<name>.preservemerges` much like the existing `branch.<name>.rebase`.

The patches haven't gotten an explicit "no" that I noticed, nor have they been applied...is there anything I can do to move them along? Resubmit them or what not?

Thanks, Stephen

Next: Johannes Schindelin
Message 1 of 6 in “pull --preserve-merges”
  1. Stephen HabermanNov 7, 2008
  2. Johannes SchindelinNov 8, 2008
  3. Francis GaliegueNov 8, 2008
  4. Stephen HabermanNov 8, 2008
  5. Stephen HabermanNov 10, 2008
  6. Johannes SchindelinNov 10, 2008

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.