Signed-off-by: Jakub Narebski <jnareb@xxxxxxxxx> --- This patch applies to 'todo' branch! Perhaps TODO entry should be replaced (updated) to say about format of gitweb diff for merge commits (diffstat in HTML, improving difftree for merges), instead of just deleting it. TODO | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/TODO b/TODO index 6c603db..305363a 100644 --- a/TODO +++ b/TODO @@ -85,17 +85,6 @@ the box. [jc: limbo?] -* Gitweb diff on merge commits - -From: Linus Torvalds <torvalds@xxxxxxxx> -Subject: Re: git show and gitweb gives different result for kernel -Message-ID: <Pine.LNX.4.64.0610061202060.3952@xxxxxxxxxxx> - -Maybe allow gitweb to show diff with any parent and diff --cc, -not just diff with the first parent for a merge. - -[jc: Jakub is interested in it] - * Delegate gitweb part to somebody else. * Use gitattributes for more things. -- 1.5.1.3 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html