On 12.12.2011 18:05 Stephen Bash wrote:
----- Original Message ----- > From: "Jeff King" <peff@xxxxxxxx> 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.
-- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html