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, 19:08 UTC
Message-ID
<20130808140839.56c8343f@sh9>
In-Reply-To
<1375983492-32282-2-git-send-email-stephen@exigencecorp.com>
> This is because "git pull" currently does not know about rebase's
> preserve merges flag, which would this behavior, and instead replay
> on the merge commit of the feature branch onto the new master, and
> not the entire feature branch itself.
Ack, sorry, I was doing this too late last night--should say:

This is because "git pull" currently does not know about rebase's preserve merges flag, which would avoid this behavior by replaying the merge commit of the feature branch onto the new master, and not replaying each individual commit in the feature branch.

- Stephen
Previous: Stephen HabermanNext: Johannes Schindelin
Message 3 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.