On Tue, May 19, 2015 at 03:12:31PM -0700, Junio C Hamano wrote:
> Philippe De Muyter <[email protected]> writes:
>
> > On Tue, May 19, 2015 at 09:01:10AM -0700, Junio C Hamano wrote:
> >> Philippe De Muyter <[email protected]> writes:
> >>
> >> > Trying to understand, I have eventually done "git log" on my branch and
> >> > on v3.15 with the following commands :
> >> >
> >> > git log v3.15 --full-history --decorate=short | grep '^commit' >
> >> > /tmp/3.15.commits
> >> > git log --full-history --decorate=short | grep '^commit' >
> >> > /tmp/mybranch.commits
> >>
> >> Either
> >>
> >> git log --oneline v3.15..HEAD ;# show what I have not in theirs
> >>
> >> or
> >>
> >> gitk v3.15...HEAD ;# show our differences graphically
> >
> > This shows the commits in my branch starting from the most recent common
> > point,
> > thus my commits, but I see differences in the files not explained by my
> > commits,
> > but by the fact that many older commits (between v3.13 and v3.14) are
> > missing on
> > my branch, but still in both branches I have a commit called v3.14 with the
> > same hash. Is that normal ?
>
> Sorry, cannot parse. Neither of the above would show files, so just
> about the place where you start talking about "I see differences in
> the files", you lost me.
Look at the other part of the thread, with the discussion with Jeff and John
The light has come, and what I understand is:
don't trust the default (ordering) mode of 'git log' :(
I surmise this happens only when 'git merge' has been used.
Philippe
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
