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

Re: About -X<option>

From
Miklos Vajna <vmiklos@frugalware.org>
Date
Jul 5, 2008, 13:32 UTC
Message-ID
<20080705133245.GH4729@genesis.frugalware.org>
In-Reply-To
<alpine.DEB.1.00.0807051454060.3334@eeepc-johanness>
On Sat, Jul 05, 2008 at 02:57:12PM +0200, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
Show 6 quoted lines
> So, how about using this syntax instead?
> 
> 	git pull -s recursive,theirs
> 
> i.e. strategy terms consist of the strategy name, optionally followed by a 
> comma separated list of backend options.

As a user I would think that it tells git-merge to first try 'recursive' then 'theirs'.

Of course you can still say that users should read the documentation, but... ;-)

Previous: Johannes SchindelinNext: Pieter de Bie
Message 2 of 8 in “About -X<option>”
  1. Johannes SchindelinJul 5, 2008
  2. Miklos VajnaJul 5, 2008
  3. Pieter de BieJul 5, 2008
  4. Junio C HamanoJul 5, 2008
  5. Johannes SchindelinJul 6, 2008
  6. Junio C HamanoJul 6, 2008
  7. Johannes SchindelinJul 6, 2008
  8. Junio C HamanoJul 6, 2008

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.