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 11, 2013, 23:38 UTC
Message-ID
<20130811183845.18381b8c@sh9>
In-Reply-To
<CAPrKj1aMURcVoaiJ+WS64ekafUZgSagKrYSknTUk3+TL6tCETQ@mail.gmail.com>
Hi Andres,
> i just realized that there are ambiguities:
> pull --rebase (true|false|preserve) foo # pull from remote named
> (true|false|preserve), branch foo
Yeah.

Right now, I did the latter. Around line 125, when parsing "--rebase <somearg>", we accept <somearg> only if it's true, false, or preserve, and shift it off. Otherwise we leave it alone and assume it's a remote name.

Without this logic, t5520 fails because it uses "git pull --rebase . copy", which, as you noted, is ambiguous, so "." was showing up as the rebase argument.

So, this is technically handled right now, but I'm fine removing the ambiguous "--rebase true|false|preserve" option if that is what is preferred.

- Stephen
Previous: Andres PereraNext: Junio C Hamano
Message 5 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.