From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Subject: Re: Avoiding uninteresting merges in Cairo
Date: Fri, 15 Dec 2006 15:21:36 +0100 [thread overview]
Message-ID: <eluasq$v7q$3@sea.gmane.org> (raw)
In-Reply-To: 87slfh4xkm.wl%cworth@cworth.org
Carl Worth wrote:
> On Thu, 14 Dec 2006 22:25:30 -0500, Shawn Pearce wrote:
>> * gitweb made it appear as though a whole lot of Carl's recent
>> work was somehow undone in the merge.
>
> That looks like a simple gitweb bug. None of the other tools, (gitk,
> git log -p), consider a trivial merge commit like this as having
> anything interesting in it worth displaying.
It's not a bug, it is rather lack of feature (or misfeature).
Gitweb deals with multiparent commits (merge commits) that it uses
_first_ parent. No special casing merges (like git-show doesn't
show whatchanged/patch for merges), no support for -c/--cc diff
(combined diff format).
--
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
next prev parent reply other threads:[~2006-12-15 14:20 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-15 2:06 Avoiding uninteresting merges in Cairo Shawn Pearce
2006-12-15 3:17 ` Carl Worth
2006-12-15 3:25 ` Shawn Pearce
2006-12-15 4:01 ` Carl Worth
2006-12-15 7:53 ` Shawn Pearce
2006-12-15 14:21 ` Jakub Narebski [this message]
2006-12-15 15:01 ` Shawn Pearce
2006-12-15 15:57 ` Jakub Narebski
2006-12-15 16:03 ` Shawn Pearce
2006-12-15 16:53 ` [PATCH] gitweb: Do not show difftree for merges in "commit" view Jakub Narebski
2006-12-15 21:03 ` Avoiding uninteresting merges in Cairo 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='eluasq$v7q$3@sea.gmane.org' \
--to=jnareb@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).