Philippe De Muyter [off-list ref] 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
may give you a better picture than what you did, which was to
artificially flatten the topology and lose the crucial information
as to which commit is the parents of which other commit.
On Tue, May 19, 2015 at 09:01:10AM -0700, Junio C Hamano wrote:
Philippe De Muyter [off-list ref] writes:
quoted
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 ?
Philippe
On Tue, May 19, 2015 at 11:47 PM, Philippe De Muyter [off-list ref] wrote:
On Tue, May 19, 2015 at 09:01:10AM -0700, Junio C Hamano wrote:
quoted
Philippe De Muyter [off-list ref] writes:
quoted
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 ?
As this is the linux kernel, maybe everything you are working on is
open source and you can push it to a public git hosting service (like
GitHub, BitBucket, ...), so people can have a look there or clone it
from there?
(And if you do that it would help when talking about differences in
some files, if you could tell which files and which commits, and maybe
also which git commands you used.)