From: Ryan Anderson Date: Tue, 04 Jul 2006 01:30:00 GMT Subject: [PATCH 0/2] Fix handling of merges in git-annotate Message-ID: <11519766021208-git-send-email-ryan@michonline.com> 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. Ryan Anderson: annotate: Support annotation of files on other revisions. annotate: Correct most merge following to annotate correctly. git-annotate.perl | 197 ++++++++++++++++++++++++++++++++++++--------------- t/t8001-annotate.sh | 6 ++ 2 files changed, 145 insertions(+), 58 deletions(-)