From: andreas.t.auer_gtml_37453@ursus.ath.cx
To: Stephen Bash <bash@genarts.com>
Cc: Jeff King <peff@peff.net>, git discussion list <git@vger.kernel.org>
Subject: Re: Git blame only current branch
Date: Mon, 12 Dec 2011 18:19:21 +0100 [thread overview]
Message-ID: <4EE63799.6020409@ursus.ath.cx> (raw)
In-Reply-To: <5e2440c1-8d11-4d92-b42f-14169a62ced1@mail>
On 12.12.2011 18:05 Stephen Bash wrote:
> ----- Original Message -----
> > From: "Jeff King" <peff@peff.net> Sent: Monday, December 12, 2011
> > 11:55:42 AM Subject: Re: Git blame only current branch
> >
> > On Mon, Dec 12, 2011 at 10:24:47AM -0500, Stephen Bash wrote:
> >
> > Usually when you are interested in seeing merges like this in
> > git-log, you would use one of "--first-parent" or "--merges".
> > However, though "git blame" takes revision arguments, it does its
> > own traversal of the graph that does not respect those options.
>
> My first thought was --first-parent, and was disappointed when I
> didn't find it in the blame documentation :) I think for my purposes
> --first-parent is better than --merges because there are non-merge
> commits on the branch(es) of interest (and thus I think the problem
> would become ill-posed in the --merges case).
>
> > Modifying it to do --first-parent is pretty easy: ... snip ...
>
> That's pretty simple... I'll try to do a little testing this
> afternoon.
You might need to consider that if the master branch was first merged
into topicA before topicA was merged back to the master that the master
would only be fast-forwarded and so the first parent of M would be 3 not
C. So depending how the developers merged you might get different results.
next prev parent reply other threads:[~2011-12-12 17:20 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <e9e35956-a091-4143-8fd4-3516b54263a6@mail>
2011-12-12 15:24 ` Git blame only current branch Stephen Bash
2011-12-12 16:55 ` Jeff King
2011-12-12 17:05 ` Stephen Bash
2011-12-12 17:19 ` andreas.t.auer_gtml_37453 [this message]
2011-12-13 2:07 ` Vijay Lakshminarayanan
2011-12-13 2:14 ` Jeff King
2011-12-13 5:47 ` Junio C Hamano
2011-12-13 14:09 ` Vijay Lakshminarayanan
2011-12-13 14:18 ` Frans Klaver
2011-12-13 17:25 ` Junio C Hamano
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=4EE63799.6020409@ursus.ath.cx \
--to=andreas.t.auer_gtml_37453@ursus.ath.cx \
--cc=bash@genarts.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).