Re: Avoiding uninteresting merges in Cairo

Carl Worth wrote:

On Thu, 14 Dec 2006 22:25:30 -0500, Shawn Pearce wrote:

quoted

 * 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