Re: git-subtree: directory mismatch
- From
Björn Steinbrink <b.steinbrink@gmx.de>
- Date
- Nov 25, 2009, 23:41 UTC
- Message-ID
- <20091125234122.GA31422@atjola.homenet>
- In-Reply-To
- <32541b130911251520l7a84554bxab9cf59ff9d8fc1@mail.gmail.com>
On 2009.11.25 18:20:45 -0500, Avery Pennarun wrote:
Show 14 quoted lines
> On Wed, Nov 25, 2009 at 6:17 PM, Johannes Schindelin > <Johannes.Schindelin@gmx.de> wrote: > > On Wed, 25 Nov 2009, Junio C Hamano wrote: > >> I do remember some people didn't like -X<option> syntax but I don't > >> think there was any solid counterproposal to achieve a similar goal to > >> satisfy the need to pass arbitrary parameters to the merge strategy > >> backends. > > > > I took exception to the awkward way to specify the option. A strong hint > > just how awkward -X<option> is: it is hard to implement using > > parse-options. > > I read the earlier thread and I still don't quite understand this > point. What makes it difficult?
I guess it's -Xfoo vs. -X foo (note the space). Same deal with log -S<string>. "git log -S foo" would look for an empty string (I guess) being added/removed in some commit in foo's history, while "git log -Sfoo" looks for "foo" being added/remove in HEAD's history.
Björn