diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-10-22 22:51:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-22 22:51:42 -0700 |
| commit | 05eb811aa1546b696c6c4d55593cfd4fbef0dce5 (patch) | |
| tree | bad8266ba08310f00a1998063c545dd3707fdc3c /Documentation/config.txt | |
| parent | 02a20456d2c5efccbdd0093ad2a16134f160c218 (diff) | |
| parent | 2d477051ef260aad352d63fc7d9c07e4ebb4359b (diff) | |
| download | git-05eb811aa1546b696c6c4d55593cfd4fbef0dce5.tar.gz | |
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
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 84e38911ee..05d657444f 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -230,6 +230,10 @@ pull.octopus:: pull.twohead:: The default merge strategy to use when pulling a single branch. +repack.usedeltabaseoffset:: + Allow gitlink:git-repack[1] to create packs that uses + delta-base offset. Defaults to false. + show.difftree:: The default gitlink:git-diff-tree[1] arguments to be used for gitlink:git-show[1]. |