From: Junio C Hamano <gitster@pobox.com>
To: Pieter de Bie <frimmirf@gmail.com>
Cc: Miklos Vajna <vmiklos@frugalware.org>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
gitster@pobox.com, git@vger.kernel.org
Subject: Re: About -X<option>
Date: Sat, 05 Jul 2008 10:40:16 -0700 [thread overview]
Message-ID: <7v63rktekf.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <AB745D70-D23A-4742-A5B3-DC1B6CAD9C30@ai.rug.nl> (Pieter de Bie's message of "Sat, 5 Jul 2008 15:48:07 +0200")
Pieter de Bie <frimmirf@gmail.com> writes:
> 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?
How would you do the equivalent of
git pull -s recursive -Xsubtree="My Playpen/" -Xours
with the syntax?
Note that the current scripted "pull" and "merge" has a limitation that it
does not allow $IFS in -X<option> but that is not a designed-in limitation
but purely comes from a lazy implementation .
Also I do not see why -X<option> is not easy with parseopt() as Dscho
claimed in the original message in this thread...
next prev parent reply other threads:[~2008-07-05 17:42 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
2008-07-05 13:48 ` Pieter de Bie
2008-07-05 17:40 ` Junio C Hamano [this message]
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=7v63rktekf.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=frimmirf@gmail.com \
--cc=git@vger.kernel.org \
--cc=vmiklos@frugalware.org \
/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.