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

Re: [RFC/PATCH] gitweb: Create special from-file/to-file header for combined diff

From
Junio C Hamano <junkio@cox.net>
Date
May 28, 2007, 01:43 UTC
Message-ID
<7v1wh1en8k.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<11803077792064-git-send-email-jnareb@gmail.com>
Jakub Narebski <jnareb@gmail.com> writes:
Show 12 quoted lines
> Instead of using default, diff(1) like from-file/to-file header for
> combined diff (for a merge commit), which looks like:
>
>   --- a/git-gui/git-gui.sh
>   +++ b/_git-gui/git-gui.sh_
>
> (where _link_ denotes [hidden] hyperlink), create from-file(n)/to-file
> header, using n/file for each or parents, e.g.:
>
>   --- 1/_git-gui/git-gui.sh_
>   --- 2/_git-gui.sh_
>   +++ b/_git-gui/git-gui.sh_

Sounds quite straightforward to implement, and diff with 1/ would be useful to recreate what the person who did the merge pulled in, for most of the time. I suspect diff with 2/ is almost always uninteresting, though.

Previous: Jakub NarebskiNext: Jakub Narebski
Message 5 of 8 in “gitweb: Split git_patchset_body into separate subroutines”
  1. gitweb: Split git_patchset_body into separate subroutinesJakub Narebski, May 27, 2007
  2. gitweb: Create special from-file/to-file header for combined diffJakub Narebski, May 27, 2007
  3. gitweb: Create special from-file/to-file header for combined diffJakub Narebski, May 27, 2007
  4. Jakub NarebskiMay 27, 2007
  5. Junio C HamanoMay 28, 2007
  6. Jakub NarebskiMay 28, 2007
  7. Petr BaudisMay 28, 2007
  8. Jakub NarebskiMay 28, 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.