Re: What's cooking in git.git (Oct 2011, #08; Fri, 21)

From: Jakub Narebski <jnareb@gmail.com>
Date: Oct 22, 2011, 13:32 UTC
Message-ID: <m3mxct5f01.fsf@localhost.localdomain>
In-Reply-To: <m3r5256h76.fsf@localhost.localdomain>

Jakub Narebski <jnareb@gmail.com> writes:

> Junio C Hamano <gitster@pobox.com> writes:

Show 13 quoted lines

> > * kk/gitweb-side-by-side-diff (2011-10-17) 2 commits
> >  - gitweb: add a feature to show side-by-side diff
> >  - gitweb: change format_diff_line() to remove leading SP from $diff_class
> > 
> > Fun.
> > Will keep in 'pu' until the planned re-roll comes.
> 
> I think this needs some more work, not only re-roll...
> 
> 
> BTW. the bottom commit could be I think replaced by mine
> 
>    - gitweb: Refactor diff body line classification

Nb. that needs a easy but non-trivial merge conflict resolution, see e.g.

-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- The following changes since commit 8963314c77af9a4eda5dcbdbab3d4001af83ad81:

  Sync with maint (2011-10-21 11:24:34 -0700)

are available in the git repository at:

  git://repo.or.cz/git/jnareb-git.git gitweb/side-by-side-diff

Jakub Narebski (1):
      gitweb: Refactor diff body line classification

Kato Kazuyoshi (1):
      gitweb: add a feature to show side-by-side diff

 gitweb/gitweb.perl       |  144 ++++++++++++++++++++++++++++++++++------------
 gitweb/static/gitweb.css |   15 +++++
 2 files changed, 123 insertions(+), 36 deletions(-)

-- 
Jakub Narebski