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, 16:28 UTC
Message-ID
<20130812112801.0aae67a2@sh9>
In-Reply-To
<7vpptjz9r1.fsf@alter.siamese.dyndns.org>
Hi Junio,
> "-r", even though it happens to be accepted, is not a good idea
> here, as there are other --r* commands that are not --rebase.
> 
> 	[--[no-]rebase|--rebase=preserve]
Cool, I will change that.
> You would want "bool or string" helper function to parse it
> correctly, something like:

Oh, interesting, I had not thought of that--thanks for that git config --bool snippet, that's really helpful.

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