git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Avoiding uninteresting merges in Cairo

From
Jakub Narebski <jnareb@gmail.com>
Date
Dec 15, 2006, 14:21 UTC
Message-ID
<eluasq$v7q$3@sea.gmane.org>
In-Reply-To
<87slfh4xkm.wl%cworth@cworth.org>
Carl Worth wrote:
> On Thu, 14 Dec 2006 22:25:30 -0500, Shawn Pearce wrote:
Show 6 quoted lines
>>  * 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
Previous: Shawn PearceNext: Shawn Pearce
Message 6 of 8 in “Avoiding uninteresting merges in Cairo”
  1. Shawn PearceDec 15, 2006
  2. Carl WorthDec 15, 2006
  3. Shawn PearceDec 15, 2006
  4. Carl WorthDec 15, 2006
  5. Shawn PearceDec 15, 2006
  6. Jakub NarebskiDec 15, 2006
  7. Shawn PearceDec 15, 2006
  8. Junio C HamanoDec 15, 2006

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.