From: Miklos Vajna <vmiklos@frugalware.org>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: gitster@pobox.com, git@vger.kernel.org
Subject: Re: About -X<option>
Date: Sat, 5 Jul 2008 15:32:45 +0200 [thread overview]
Message-ID: <20080705133245.GH4729@genesis.frugalware.org> (raw)
In-Reply-To: <alpine.DEB.1.00.0807051454060.3334@eeepc-johanness>
[-- Attachment #1: Type: text/plain, Size: 484 bytes --]
On Sat, Jul 05, 2008 at 02:57:12PM +0200, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> 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... ;-)
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next prev parent reply other threads:[~2008-07-05 13:33 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-05 12:57 About -X<option> Johannes Schindelin
2008-07-05 13:32 ` Miklos Vajna [this message]
2008-07-05 13:48 ` Pieter de Bie
2008-07-05 17:40 ` Junio C Hamano
2008-07-06 1:44 ` Johannes Schindelin
2008-07-06 4:57 ` Junio C Hamano
2008-07-06 11:28 ` Johannes Schindelin
2008-07-06 19:25 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080705133245.GH4729@genesis.frugalware.org \
--to=vmiklos@frugalware.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.