From: James Blackburn <jamesblackburn@gmail.com>
To: git@vger.kernel.org
Subject: Re: git log --follow doesn't follow a rename over a merge
Date: Thu, 16 Jun 2011 18:01:25 +0100 [thread overview]
Message-ID: <BANLkTi=4S08h=uMV5oo7S9qpruMot2kVfg@mail.gmail.com> (raw)
In-Reply-To: <BANLkTik1-UvEXqzgdXwcK3x6_o8fDiwB7g@mail.gmail.com>
I see a lot of this has been discussed before... but just to add that
Jeff's blame-log.sh:
http://git.661346.n2.nabble.com/alternate-log-follow-idea-td1385917.html
seems to work and show the full history of the file past the rename+merge!
I was also interested in whether there's a better way of re-connecting
history than grafting one repository's history into the commit which
made it visible in another? AFAICS the graft is no different to a
merge commit which contains a rename in the merged node, so I'm
guessing this is a reasonable thing to do?
Cheers,
James
next prev parent reply other threads:[~2011-06-16 17:01 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 [this message]
2011-06-16 17:45 ` Jeff King
2011-06-16 17:34 ` Jeff King
2011-06-16 17:59 ` Junio C Hamano
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='BANLkTi=4S08h=uMV5oo7S9qpruMot2kVfg@mail.gmail.com' \
--to=jamesblackburn@gmail.com \
--cc=git@vger.kernel.org \
/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).