From: Thomas Rast <trast@student.ethz.ch>
To: Junio C Hamano <gitster@pobox.com>
Cc: Bo Yang <struggleyb.nku@gmail.com>, <git@vger.kernel.org>
Subject: Re: [PATCH 1/2] Add a basic idea section for git-blame.
Date: Thu, 8 Apr 2010 18:27:22 +0200 [thread overview]
Message-ID: <201004081827.22706.trast@student.ethz.ch> (raw)
In-Reply-To: <7vmxxe74s2.fsf@alter.siamese.dyndns.org>
Junio C Hamano wrote:
> Bo Yang <struggleyb.nku@gmail.com> writes:
>
> > +A call to `git-blame <rev> -- <file>` works as follows:
> > +
> > +- Look at `git diff <rev>^ <rev>` to see what the commit did.
> > +
> > +- Discard all `-` lines in the diff, since they are no longer part of
> > + `<file>`.
> > +
> > +- Take blame for all `+` lines; i.e., the newly added lines according
> > + to the diff are attributed to `<rev>`.
>
> I hate to say it, but this is horrifying; it works quite the other way
> around.
>
> The name of the game is not "take blame by looking at the diff to see what
> we introduced"; it is "avoid taking blame at all cost, by looking at the
> diff to see what we might have inherited from our parents".
"Horrifying" seems a fairly harsh word for another way to describe the
process *in linear history* and with default settings, doesn't it?
I now see that "assume linear history" is oversimplifying the process,
but I have to take blame^W^W^W^Wwill fail to shift blame for it since
I suggested that.
> For illustrated description, read the classic:
>
> http://thread.gmane.org/gmane.comp.version-control.git/28826
>
> Almost all the hits in the first page from this query would help, too:
>
> http://search.gmane.org/?query=On+blame%2Fpickaxe&author=Junio+C+Hamano&group=gmane.comp.version-control.git&sort=revdate&DEFAULTOP=and&[=2&xP=blame%09pickaxe&xFILTERS=Gcomp.version-control.git-Ac-Ahamano-Ajunio---A
Thanks. I trust this will help Bo make a revised description for the
manpage.
[PS for the list record: while part of the patches is indeed mine, I
never signed off on them.]
--
Thomas Rast
trast@{inf,student}.ethz.ch
next prev parent reply other threads:[~2010-04-08 16:27 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-08 6:51 [PATCH 0/2] Document update for 'git-blame' '-M' and '-C' option Bo Yang
2010-04-08 6:51 ` [PATCH 1/2] Add a basic idea section for git-blame Bo Yang
2010-04-08 6:51 ` [PATCH 2/2] Change the description of '-M' and '-C' option Bo Yang
2010-04-08 8:00 ` [PATCH 1/2] Add a basic idea section for git-blame Junio C Hamano
2010-04-08 16:27 ` Thomas Rast [this message]
2010-04-08 16:51 ` Junio C Hamano
2010-04-09 5:11 ` Bo Yang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201004081827.22706.trast@student.ethz.ch \
--to=trast@student.ethz.ch \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=struggleyb.nku@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.