From: Jonathan Nieder <jrnieder@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: log -S with evil merges
Date: Mon, 12 Jul 2010 01:39:50 -0500 [thread overview]
Message-ID: <20100712063949.GA6301@burratino> (raw)
In-Reply-To: <7v39vpfcte.fsf@alter.siamese.dyndns.org>
Junio C Hamano wrote:
> Jonathan Nieder <jrnieder@gmail.com> writes:
>> ; git log --oneline -c -S'UE_ALWAYS' --follow builtin/reflog.c
>>
>> does not work --- it mentions _all_ merges. Why?
>
> I don't think --follow, which is merely a checkbox item, is friendly to
> most other git features.
Hmm, leaving out the --follow makes it behave again. Thanks for the tip.
> Does it even show diff with the corresponding
> file at the commit where filename is changed?
$ git tag lt/deepen-builtin-source 81b50f3
$ git diff --raw --follow lt/deepen-builtin-source^! -- builtin/reflog.c
:100644 100644 7498210... 7498210... R100 builtin-reflog.c builtin/reflog.c
$ git diff-tree --abbrev -c --follow v1.7.2-rc0~122 -- builtin/reflog.c
a660534e06147f8867d6c9b6c41025427a7b5c6c
::100644 100644 100644 f732156... fafb740... ebf610e... MR builtin/reflog.c
Looks good to me...
prev parent reply other threads:[~2010-07-12 6:40 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-10 19:48 log -S with evil merges Jonathan Nieder
2010-07-12 6:12 ` Junio C Hamano
2010-07-12 6:39 ` Jonathan Nieder [this message]
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=20100712063949.GA6301@burratino \
--to=jrnieder@gmail.com \
--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).