From: Philippe De Muyter <phdm@macq.eu>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: identical hashes on two branches, but holes in git log
Date: Tue, 19 May 2015 23:47:20 +0200 [thread overview]
Message-ID: <20150519214719.GA12732@frolo.macqel> (raw)
In-Reply-To: <xmqq617oa75l.fsf@gitster.dls.corp.google.com>
On Tue, May 19, 2015 at 09:01:10AM -0700, Junio C Hamano wrote:
> Philippe De Muyter <phdm@macq.eu> 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 ?
Philippe
next prev parent reply other threads:[~2015-05-19 21:47 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-19 13:29 identical hashes on two branches, but holes in git log Philippe De Muyter
2015-05-19 16:01 ` Junio C Hamano
2015-05-19 21:47 ` Philippe De Muyter [this message]
2015-05-19 22:12 ` Junio C Hamano
2015-05-21 7:15 ` Philippe De Muyter
2015-05-21 19:58 ` Philip Oakley
2015-05-21 20:37 ` Philippe De Muyter
2015-05-20 7:39 ` Christian Couder
2015-05-19 23:39 ` Jeff King
2015-05-20 13:13 ` Philippe De Muyter
2015-05-20 13:25 ` John Keeping
2015-05-20 14:12 ` Philippe De Muyter
2015-05-20 16:18 ` Jeff King
2015-05-21 7:05 ` Philippe De Muyter
2015-05-21 16:45 ` 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=20150519214719.GA12732@frolo.macqel \
--to=phdm@macq.eu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).