From: Junio C Hamano <junkio@cox.net>
Date: Thu, 2 Mar 2006 06:08:12 +0000 (-0800)
Subject: Merge branch 'np/delta' into next
X-Git-Tag: v1.3.0-rc1~54^2~10
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=b485db9896654b11c8a7bf64fd5cc3d0d8dc5b69;p=git.git

Merge branch 'np/delta' into next

* np/delta:
  diff-delta: allow reusing of the reference buffer index
  diff-delta: bound hash list length to avoid O(m*n) behavior
  diff-delta: produce optimal pack data
  Merge branch 'kh/svnimport'
  Merge branch 'js/refs'
  annotate: fix -S parameter to take a string
  annotate: Add a basic set of test cases.
  annotate: handle \No newline at end of file.
  gitview: Use horizontal scroll bar in the tree view
---

b485db9896654b11c8a7bf64fd5cc3d0d8dc5b69