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

Re: [PATCH 0/6] gitweb: Add combined diff support

From
Junio C Hamano <junkio@cox.net>
Date
May 8, 2007, 01:31 UTC
Message-ID
<7vvef45cev.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<11784930091585-git-send-email-jnareb@gmail.com>

I've minimally tried this on my private machine. Looks pretty nice for simple merges, but I think we would want --cc not -c most of the time.

Pushed out in 'next'.  Thanks.
Previous: Jakub NarebskiNext: Jakub Narebski
Message 9 of 12 in “gitweb: Add combined diff support”
  1. 0/6 gitweb: Add combined diff supportJakub Narebski, May 6, 2007
  2. 1/6 gitweb: Add parsing of raw combined diff format to parse_difftree_raw_lineJakub Narebski, May 6, 2007
  3. 2/6 gitweb: Add combined diff support to git_difftree_bodyJakub Narebski, May 6, 2007
  4. 3/6 gitweb: Add combined diff support to git_patchset_bodyJakub Narebski, May 6, 2007
  5. 4/6 gitweb: Make it possible to use pre-parsed info in git_difftree_bodyJakub Narebski, May 6, 2007
  6. 5/6 gitweb: Show combined diff for merge commits in 'commitdiff' viewJakub Narebski, May 6, 2007
  7. 6/6 gitweb: Show combined diff for merge commits in 'commit' viewJakub Narebski, May 6, 2007
  8. 7/6 todo: Remove "Gitweb diff on merge commits" entryJakub Narebski, May 6, 2007
  9. Junio C HamanoMay 8, 2007
  10. Jakub NarebskiMay 8, 2007
  11. 7/6 gitweb: Empty patch for merge means trivial merge, not no differencesJakub Narebski, May 16, 2007
  12. Junio C HamanoMay 16, 2007

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.