Re: What's cooking in git.git (topics)
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Jul 20, 2008, 19:07 UTC
- Message-ID
- <alpine.DEB.1.00.0807202102370.3305@eeepc-johanness>
- In-Reply-To
- <7vd4l88l77.fsf@gitster.siamese.dyndns.org>
Hi,
On Sun, 20 Jul 2008, Junio C Hamano wrote:
Show 17 quoted lines
> Miklos Vajna <vmiklos@frugalware.org> writes: > > > Third, it would be nice to allow passing extra parameter(s) to the > > backends, but I do not know what concept is the best here. The > > strategy1=foo,stategy2=bar limits the input to a single string. Is that > > enough? Given that recursive=theirs was considered harmful, we don't > > have too much examples;... > > I personally think -sstrategy=string1,string2,... is simply a bad taste. > > Why force yourself to parse things by having the users to concatenate > something that the user could give us separated? If you care about the > order and association between strategy and their options, you can always > do: > > -s strategy1 -X option-1-for-strategy-1 -X option-2-for-strategy-1 \ > -s strategy2 -X option-1-for-strategy-2 ...
You mean something like
$ git merge -s subtree -X --path -X git-gui/ git-gui/master
Wow. :-)
Speechless, Dscho