From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 04 Sep 2008 19:05:50 GMT
Subject: Re: [PATCH] merge-recursive: move the global obuf to struct merge_options
Message-ID: <7vr67z3f5d.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <cover.1220463034.git.vmiklos@frugalware.org>

Miklos Vajna <vmiklos@frugalware.org> writes:

> These, and the 4 other related patches which are not yet in git.git at
> the moment are also available in the 'merge-recursive' branch of
> git://repo.or.cz/git/vmiklos.git.

Thanks.

I already expressed my doubts about "move make_virtual_commit()".

"add merge-recursive to LIB_H" should go to 'maint' as a build-fix, so it
does not have to be on this topic.  If this is meant to be a pullable
topic branch, I'd prefer if you didn't have that commit.

I cherry picked call-depth, index-only removal, obuf and current_{f/d}
but haven't pushed the results out.