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

Re: [PATCH] Support merge strategy options in rebase

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 28, 2010, 21:17 UTC
Message-ID
<7vaautvz46.fsf@alter.siamese.dyndns.org>
In-Reply-To
<1267332207-22675-1-git-send-email-mike@fluffypenguin.org>
Mike Lundy <mike@fluffypenguin.org> writes:
Show 9 quoted lines
> The manpage says that git-rebase supports merge strategies, but the rebase
> command doesn't know about -X, and gives the usage when presented with it.
>
> Signed-off-by: Mike Lundy <mike@fluffypenguin.org>
> ---
>
>  My test modification only makes sure that the argument is accepted; it assumes
>  merge strategies are already tested and they won't actually be needed, because
>  there's no conflict.

How well does this work when strategy options need to contain a whitespace?

Previous: Mike Lundy
Message 2 of 2 in “Support merge strategy options in rebase”
  1. Support merge strategy options in rebaseMike Lundy, Feb 28, 2010
  2. Junio C HamanoFeb 28, 2010

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.