Merge branch 'np/pack'

* np/pack:
  add the capability for index-pack to read from a stream
  index-pack: compare only the first 20-bytes of the key.
  git-repack: repo.usedeltabaseoffset
  pack-objects: document --delta-base-offset option
  allow delta data reuse even if base object is a preferred base
  zap a debug remnant
  let the GIT native protocol use offsets to delta base when possible
  make pack data reuse compatible with both delta types
  make git-pack-objects able to create deltas with offset to base
  teach git-index-pack about deltas with offset to base
  teach git-unpack-objects about deltas with offset to base
  introduce delta objects with offset to base

diff --cc Documentation/config.txt
Simple merge

diff --cc Documentation/git-pack-objects.txt
Simple merge

diff --cc Documentation/git-repack.txt
index d2eaa0995ded915f89d436e4501c5ae667822642,4e6631a27fd10344984026949f990e36cb45e6bf..0fa47e3b018815ffa9de23725737fe2b599eaead
--- 1/Documentation/git-repack.txt
--- 2/Documentation/git-repack.txt
+++ b/Documentation/git-repack.txt
@@@ -64,9 -64,22 +64,23 @@@ OPTION
        space. `--depth` limits the maximum delta depth; making it too deep
        affects the performance on the unpacker side, because delta data needs
        to be applied that many times to get to the necessary object.
 +      The default value for both --window and --depth is 10.
  
  
+ Configuration
+ -------------
+ 
+ When configuration variable `repack.UseDeltaBaseOffset` is set
+ for the repository, the command passes `--delta-base-offset`
+ option to `git-pack-objects`; this typically results in slightly
+ smaller packs, but the generated packs are incompatible with
+ versions of git older than (and including) v1.4.3; do not set
+ the variable in a repository that older version of git needs to
+ be able to read (this includes repositories from which packs can
+ be copied out over http or rsync, and people who obtained packs
+ that way can try to use older git with it).
+ 
+ 
  Author
  ------
  Written by Linus Torvalds <torvalds@osdl.org>

diff --cc cache.h
Simple merge

diff --cc git-repack.sh
index f2c9071d1109e014832f0efd8a1fd67dca44c8af,2a214891a8d8ddbf11dcce2d655d3cab0614e064..17e24526c279467891389295a55f8f257ca0d01b
--- 1/git-repack.sh
--- 2/git-repack.sh
+++ b/git-repack.sh
@@@ -3,8 -3,7 +3,8 @@@
  # Copyright (c) 2005 Linus Torvalds
  #
  
- USAGE='[-a] [-d] [-f] [-l] [-n] [-q]'
+ USAGE='[-a] [-d] [-f] [-l] [-n] [-q] [--window=N] [--depth=N]'
 +SUBDIRECTORY_OK='Yes'
  . git-sh-setup
  
  no_update_info= all_into_one= remove_redundant=

diff --cc pack.h
Simple merge

diff --cc sha1_file.c
Simple merge