Re: [PATCH] git-pickaxe: blame rewritten.

From: Junio C Hamano <junkio@cox.net>
Date: Oct 13, 2006, 21:38 UTC
Message-ID: <7vy7rjc2vg.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20061013205418.5087.qmail@web31803.mail.mud.yahoo.com>

Luben Tuikov <ltuikov@yahoo.com> writes:

Show 12 quoted lines

> --- Junio C Hamano <junkio@cox.net> wrote:
>> Luben Tuikov <ltuikov@yahoo.com> writes:
>> 
>> > Junio, is it possible to also print the "previous" commit?
>> > I mean, is it tenable to print the commit such that
>> > a "git-diff C B -- A:file" will give a diff of the block of lines
>> > we're looking at?
>> 
>> There is no single "previous" in general.  Which side of the
>> merge would you take?
>
> The parent commit.

There is no single "the parent commit" in general. Which side of the merge would you take?

Also remeber, when we blame a line to a revision (unless we do not limit the blame with v2.6.18.. and --since=2.weeks which only git-pickaxe can do), the line is known to have been introduced by _that_ commit. If there were a corresponding line in "the parent commit" for that line, we would not have assigned the blame to the commit, but the blame would have been passed down to "the parent commit" already.