From: Avery Pennarun <apenwarr@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: What's cooking in git.git (Jan 2010, #05; Sat, 16)
Date: Thu, 28 Jan 2010 16:16:33 -0500 [thread overview]
Message-ID: <32541b131001281316m59128e7ds45353a30ac602b6f@mail.gmail.com> (raw)
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
prev parent reply other threads:[~2010-01-28 21:17 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-17 2:46 What's cooking in git.git (Jan 2010, #05; Sat, 16) Junio C Hamano
2010-01-17 19:40 ` Jeff King
2010-01-18 3:02 ` Jakub Narebski
2010-01-18 6:30 ` Junio C Hamano
2010-01-28 21:16 ` Avery Pennarun [this message]
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=32541b131001281316m59128e7ds45353a30ac602b6f@mail.gmail.com \
--to=apenwarr@gmail.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).