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

From: Luben Tuikov <ltuikov@yahoo.com>
Date: Oct 13, 2006, 20:54 UTC
Message-ID: <20061013205418.5087.qmail@web31803.mail.mud.yahoo.com>
In-Reply-To: <7vmz81kwh3.fsf@assigned-by-dhcp.cox.net>

--- Junio C Hamano <junkio@cox.net> wrote:

Show 9 quoted lines

> 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.

For example,
Annotation/blame of A:File
C 1 line 1
  2 line 2
D 3 line 3
B 4 line 4

The parent commit of C, such that, git-diff parent(C) C -- A:File will give me the diff which introduced the "first block", or more generally, all lines annotated with C.

Then when I click on 1 or 2, I'd like to see Annotation/blame of parent(C):File, on the line number where the C "block" was introduced.

   Luben