From: Jeff King <peff@peff.net>
Date: Fri, 17 Feb 2012 03:23:25 GMT
Subject: Re: [PATCH 0/8] config-include fixes
Message-ID: <20120217032325.GB5738@sigill.intra.peff.net>
In-Reply-To: <20120217031723.GA5738@sigill.intra.peff.net>

On Thu, Feb 16, 2012 at 10:17:23PM -0500, Jeff King wrote:

> On Thu, Feb 16, 2012 at 06:50:40PM -0800, Junio C Hamano wrote:
> 
> > I'll push out the re-roll that follows your outline above in 'pu'; I think
> > I got all the conflict resolved correctly, but please eyeball the result.
> 
> Will do.

I see you just pushed it out. The result looks good to me.

> Since you are re-rolling, these are the documentation fixes I had
> squashed in based on your earlier review (though come to think of it,
> the new patches should now also describe `git_config_with_options`).

Looks like you just reverted the "include" patch instead of the merge of
the whole topic.  I'll prepare a few documentation fixups on top, then.

-Peff