Re: Can `git blame` show the date that each line was merged?

2013-06-04 Thread Jeff King
On Tue, Jun 04, 2013 at 10:28:06AM -0700, Junio C Hamano wrote: > > (though I suspect it would interact oddly with the "--reverse" option, > > and we would want to either declare them mutually exclusive or figure > > out some sane semantics). > > It is entirely unclear who the first child is, so

Re: Can `git blame` show the date that each line was merged?

2013-06-04 Thread Junio C Hamano
Jeff King writes: > diff --git a/builtin/blame.c b/builtin/blame.c > index 57a487e..0fb67af 100644 > --- a/builtin/blame.c > +++ b/builtin/blame.c > @@ -1199,6 +1199,8 @@ static int num_scapegoats(struct rev_info *revs, struct > commit *commit) > { > int cnt; > struct commit_list *l

Re: Can `git blame` show the date that each line was merged?

2013-06-04 Thread Matt McClure
On Tue, Jun 4, 2013 at 11:56 AM, Jeff King wrote: >> Aside: in some trial and error I notice this oddity: >> >> $ git blame --merges >> usage: git blame [options] [rev-opts] [rev] [--] file >> >> [rev-opts] are documented in git-rev-list(1) >> ... > > Your problem is not the pr

Re: Can `git blame` show the date that each line was merged?

2013-06-04 Thread Jeff King
On Tue, Jun 04, 2013 at 09:39:45AM -0400, Matt McClure wrote: > Can `git blame` show the date that each line was merged to the current > branch rather than the date it was committed? Not exactly. Git does not record when a commit entered a particular branch (or what the "ours" b

Can `git blame` show the date that each line was merged?

2013-06-04 Thread Matt McClure
Can `git blame` show the date that each line was merged to the current branch rather than the date it was committed? Aside: in some trial and error I notice this oddity: $ git blame --merges usage: git blame [options] [rev-opts] [rev] [--] file [rev-opts] are documented in git