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

From: Jakub Narebski <[email-masked]>
Date: Mon, 7 May 2007 01:10:02 +0200

This series of patches adds support for showing combined diff for
merge commits in gitweb, instead of using diff with the first parent
(for 'commitdiff' view), or not showing difftree (for 'commit' view).

We use diff -c (diff --combined) and not diff --cc; the latter would
require modifying git_difftree_body and git_patchset_body for the
possibility that there is line in raw diff output format (in difftree)
that doesn't correspond to any patch: the patch part was removed due
to hunks simplification.

See also notes in individual patches.

Diffstat:
=========

 gitweb/gitweb.css  |   17 ++
 gitweb/gitweb.perl |  480 +++++++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 394 insertions(+), 103 deletions(-)

Table of contents:
==================

 [PATCH 1/6] gitweb: Add parsing of raw combined diff format to parse_difftree_raw_line
 [PATCH 2/6] gitweb: Add combined diff support to git_difftree_body
 [PATCH 3/6] gitweb: Add combined diff support to git_patchset_body
 [PATCH 4/6] gitweb: Make it possible to use pre-parsed info in git_difftree_body

Those patches prepare for adding support for combined diff for
'commitdiff' and 'commit' views.

 [PATCH 5/6] gitweb: Show combined diff for merge commits in 'commitdiff' view
 [PATCH 6/6] gitweb: Show combined diff for merge commits in 'commit' view

Those patches add (preliminary) generating combined diff for merge
commits for 'commitdiff' view (if there was not provided commit to
compare againts), and for 'commit' view.

 [PATCH 7/6] todo: todo: Remove "Gitweb diff on merge commits" entry

This patch updates TODO list in 'todo' branch.

-- 
Jakub Narebski