From: Avery Pennarun <apenwarr@gmail.com>
Date: Thu, 28 Jan 2010 21:16:33 GMT
Subject: Re: What's cooking in git.git (Jan 2010, #05; Sat, 16)
Message-ID: <32541b131001281316m59128e7ds45353a30ac602b6f@mail.gmail.com>
In-Reply-To: <7vd417udpi.fsf@alter.siamese.dyndns.org>

On Mon, Jan 18, 2010 at 1:30 AM, Junio C Hamano <gitster@pobox.com> wrote:
> Junio C Hamano <gitster@pobox.com> writes:
>
>> [Stalled]
>>
>> * ap/merge-backend-opts (2008-07-18) 6 commits
>>  - Document that merge strategies can now take their own options
>>  - Extend merge-subtree tests to test -Xsubtree=dir.
>>  - Make "subtree" part more orthogonal to the rest of merge-recursive.
>>  - Teach git-pull to pass -X<option> to git-merge
>>  - git merge -X<option>
>>  - git-merge-file --ours, --theirs
>>
>> "git pull" patch needs sq-then-eval fix to protect it from $IFS
>> but otherwise seemed good.
>
> Generally I hate to step in to fix up other's series, especially when I
> know that the party responsible for issues is capable enough.  As the
> pre-release feature freeze gets closer, however, I sometimes find myself
> doing so, and (I repeat) I hate it.

Sorry about that.  I asked at the time whether you thought I should
submit a patch or whether you were planning to do it, and didn't get
an answer.  And then when you wrote the above, I was away on vacation.
 I see it's now been merged into master, but in case you care... it
looks ok to me :)

Have fun,

Avery