From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 03 Jan 2013 22:20:31 GMT
Subject: Re: [PATCH v2 0/2] DEFAULT_DOC_TARGET
Message-ID: <7v4nixx61c.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20130103210731.GB11783@sigill.intra.peff.net>

Jeff King <peff@peff.net> writes:

> Not surprising for such a large refactoring, but this has conflicts with
> what's in next. Here's the patch to apply on top of the conflicted tree
> you get from merging this with "next":

Yeah, verifying the manual fixup is a bit tricky indeed.  The output from

 $ git blame -C HEAD^.. -- config.mak.uname | grep '^[^^]'

shows only the first line of the resulting file, and the output from

 $ git blame --reverse -C HEAD^.. -- Makefile | grep '^^'

shows only the three-line "Platform specific tweaks" comment, which
was replaced by your version in config.mak.uname, so nothing extra
was added and nothing important was lost between the two, it seems.

Thanks.