From: Junio C Hamano <junkio@cox.net>
Date: Mon, 28 May 2007 01:43:55 GMT
Subject: Re: [RFC/PATCH] gitweb: Create special from-file/to-file header for combined diff
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:

> 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.