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

Re: About -X<option>

From
PBPieter de Bie <frimmirf@gmail.com>
Date
Jul 5, 2008, 13:48 UTC
Message-ID
<AB745D70-D23A-4742-A5B3-DC1B6CAD9C30@ai.rug.nl>
In-Reply-To
<20080705133245.GH4729@genesis.frugalware.org>
On 5 jul 2008, at 15:32, Miklos Vajna wrote:
> As a user I would think that it tells git-merge to first try  
> 'recursive'
> then 'theirs'.
>
I agree with this. Perhaps there's an easy fix: how about a colon?
	git pull -s recursive:theirs
might be more intuitive?
Previous: Miklos VajnaNext: Junio C Hamano
Message 3 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.