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 12, 2013, 17:04 UTC
Message-ID
<20130812120450.47f785b2@sh9>
In-Reply-To
<7viozbz950.fsf@alter.siamese.dyndns.org>
> How should this interact with 949e0d8e (pull: require choice between
> rebase/merge on non-fast-forward pull, 2013-06-27)

I believe there should not be any conflicts in functionality, other than just tweaking the docs to mention --rebase=preserve as an option.

Personally, I would assert that, for people using a rebase workflow with "git pull", --prebase=preserve should be the default behavior, otherwise they'll be surprised when their feature branches get flattened.

Unfortunately, we can't change the behavior of the naked "--rebase" flag to really mean "--rebase=preserve", but I think that would be ideal. I think it's what people mean they do "git pull". If you want a more raw rebase, they would likely (I think/assume) be running "git rebase" directly.

Nonetheless, thanks for pointing out 949e0d8e, I did not know about it.

Perhaps after that commit graduates to master, I can base this commit on it, and tweak the new docs to suggest --rebase=preserve as the least-surprising behavior.

(Since I'm offering opinions, I think --rebase=preserve would be a great default for "git pull" in 2.0, but please ignore this statement if you've already hashed out the future/2.0 behavior of git pull.)

- Stephen
Previous: Junio C Hamano
Message 8 of 8 in “pull: Allow pull to preserve merges when rebasing.”
  1. pull: Allow pull to preserve merges when rebasing.Stephen Haberman, Aug 11, 2013
  2. Andres PereraAug 11, 2013
  3. Stephen HabermanAug 11, 2013
  4. Andres PereraAug 11, 2013
  5. Stephen HabermanAug 11, 2013
  6. Junio C HamanoAug 12, 2013
  7. Junio C HamanoAug 12, 2013
  8. Stephen HabermanAug 12, 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.