From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Graham Perks <gperks@ausperks.net>,
Git List <git@vger.kernel.org>
Subject: Re: Am able to delete a file with no trace in the log
Date: Wed, 3 Jun 2009 18:44:13 -0400 [thread overview]
Message-ID: <20090603224413.GA2902@coredump.intra.peff.net> (raw)
In-Reply-To: <7vmy8p54fr.fsf@alter.siamese.dyndns.org>
On Wed, Jun 03, 2009 at 03:38:00PM -0700, Junio C Hamano wrote:
> Actually for that "Where did my file 'x' go across the merge chain", I was
> going to suggest something like
>
> git log --simplify-merges -m --raw -- x
But in the original example, the merge commit where 'x' is deleted isn't
shown _at all_ when path limiting is used. You end up either with
"git log -m" showing the two sides of the merge separately, "git log
--simplify-merges -- x" showing stuff that happened on the side branch
but _not_ the actual merge that made a change, or of course "git log --
x" showing nothing (because we don't traverse the changing side of the
merge).
Is there a way to say "show me everything that touched x, _including_
merges"?
-Peff
next prev parent reply other threads:[~2009-06-03 22:44 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-02 19:33 Am able to delete a file with no trace in the log Graham Perks
2009-06-02 20:29 ` Tony Finch
2009-06-02 21:34 ` Jeff King
2009-06-02 21:55 ` Linus Torvalds
2009-06-03 0:47 ` Sitaram Chamarty
2009-06-03 1:20 ` Linus Torvalds
2009-06-03 1:34 ` Clean up and simplify rev_compare_tree() Linus Torvalds
2009-06-03 1:57 ` Am able to delete a file with no trace in the log Junio C Hamano
2009-06-03 3:03 ` Linus Torvalds
2009-06-03 21:18 ` Junio C Hamano
2009-06-03 21:26 ` Linus Torvalds
2009-06-03 21:33 ` Linus Torvalds
2009-06-03 21:59 ` Avery Pennarun
2009-06-03 22:02 ` Junio C Hamano
2009-06-03 22:17 ` Linus Torvalds
2009-06-03 22:38 ` Junio C Hamano
2009-06-03 22:44 ` Jeff King [this message]
2009-06-03 22:56 ` Linus Torvalds
2009-06-03 23:06 ` Jeff King
2009-06-03 23:27 ` Linus Torvalds
2009-06-03 23:37 ` Jeff King
2009-06-04 1:58 ` Linus Torvalds
2009-06-04 6:57 ` Junio C Hamano
2009-06-03 22:47 ` Linus Torvalds
2009-06-03 22:56 ` Junio C Hamano
2009-06-03 21:55 ` 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=20090603224413.GA2902@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=gperks@ausperks.net \
--cc=torvalds@linux-foundation.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).