From: Ryan Anderson Date: Tue, 04 Jul 2006 01:34:35 GMT Subject: Re: [PATCH 0/2] Fix handling of merges in git-annotate Message-ID: <44A9C5AB.1020604@michonline.com> In-Reply-To: <11519766021208-git-send-email-ryan@michonline.com> Ryan Anderson wrote: > This 2-patch series is a major overhaul to the way git-annotate calculates the blame for each line. > > Instead of parsing each diff in reverse, this uses the output from "git > diff-tree --combined", so that merges can be handled sanely. > I forgot: Please pull from http://h4x0r5.com/~ryan/git/ryan.git annotate-upstream -- Ryan Anderson sometimes Pug Majere