From: Junio C Hamano <gitster@pobox.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Jeff King <peff@peff.net>, 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, 03 Jun 2009 15:38:00 -0700 [thread overview]
Message-ID: <7vmy8p54fr.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <alpine.LFD.2.01.0906031504080.4880@localhost.localdomain> (Linus Torvalds's message of "Wed\, 3 Jun 2009 15\:17\:49 -0700 \(PDT\)")
Linus Torvalds <torvalds@linux-foundation.org> writes:
> For example, right now there is _no_ way to get even a "show diff relative
> to first parent". You can do "-m", which will show it relative to _both_
> parents, but nobody ever wants that. And you can do "-c" or "--cc", but
> that simplifies away all the paths that match in one.
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
> So here's a challenge: in the git repository, get a nice view of what your
> merges looked like. The closest I can get is
>
> git log -c --stat --grep="Merge branch '"
>
> which is actually very non-intuitive ("-c" on its own gives no useful
> output, but "-c --stat" gives nice diffstat against the first parent,
> which in this case is what we want).
I think the logical place to hook that into is the --first-parent option.
I actually have very hard resisted so far the temptation to do so because
your mantra has always been "in a merge, all parents are equal." If you
treat the first parent specially too heavily, it would go against the "I
got a pull request from you, but the resulting conflicts are too much for
me; you know the area much better than I do, so could you do the merge for
me and I'll fast forward to you later" workflow. The "first parent is the
mainline" and "I am important, so I'll merge with --no-ff to pee in the
snow" mentality problems will become worse.
next prev parent reply other threads:[~2009-06-03 22:38 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 [this message]
2009-06-03 22:44 ` Jeff King
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vmy8p54fr.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gperks@ausperks.net \
--cc=peff@peff.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).