From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: James Blackburn <jamesblackburn@gmail.com>,
Jakub Narebski <jnareb@gmail.com>,
git@vger.kernel.org
Subject: Re: git log --follow doesn't follow a rename over a merge
Date: Thu, 16 Jun 2011 10:59:23 -0700 [thread overview]
Message-ID: <7vy611hd38.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20110616173451.GB6584@sigill.intra.peff.net> (Jeff King's message of "Thu, 16 Jun 2011 13:34:51 -0400")
Jeff King <peff@peff.net> writes:
> On Thu, Jun 16, 2011 at 02:31:02PM +0100, James Blackburn wrote:
>
>> I'm also interested in knowing what incantation I need to give to
>> actually get history of the file which was previously removed. e.g. I
>> know the full path:
>> plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/service/IBreakpoints.java
>> used to exist, but without --follow, git log returns nothing.
>
> Doesn't:
>
> git log -- plugins/org.eclipse.dd.dsf.debug/src/org/eclipse/dd/dsf/debug/service/IBreakpoints.java
>
> do that?
If the file emerged in one branch (either the primary or a side branch) in
the past as a failed experiment and then got removed before merging back,
i.e.
past ---o----o-----o-----o-----o-----o-----o-----o--- now
\ /
o----*----o----o----*----o
^added ^removed
then the merges are simplified away and you would not see it.
Perhaps simplify-merges option may help.
next prev parent reply other threads:[~2011-06-16 17:59 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-15 22:41 git log --follow doesn't follow a rename over a merge James Blackburn
2011-06-16 13:25 ` Jakub Narebski
2011-06-16 13:31 ` James Blackburn
2011-06-16 17:01 ` James Blackburn
2011-06-16 17:45 ` Jeff King
2011-06-16 17:34 ` Jeff King
2011-06-16 17:59 ` Junio C Hamano [this message]
2011-06-16 18:15 ` Jeff King
2011-06-16 19:41 ` James Blackburn
2011-06-16 18:41 ` James Blackburn
2011-06-16 19:36 ` Junio C Hamano
2011-06-16 21:29 ` James Blackburn
2011-06-16 22:14 ` James Blackburn
2011-06-16 18:21 ` James Blackburn
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=7vy611hd38.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jamesblackburn@gmail.com \
--cc=jnareb@gmail.com \
--cc=peff@peff.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.