Merge branch 'master' into next

* master:
  gitweb: refactor decode() for utf8 conversion
  Add default values for --window and --depth to the docs
This commit is contained in:
Junio C Hamano
2006-10-06 03:04:00 -07:00
3 changed files with 19 additions and 11 deletions

View File

@@ -71,11 +71,11 @@ base-name::
--all::
This implies `--revs`. In addition to the list of
revision arguments read from the standard input, pretend
as if all refs under `$GIT_DIR/refs` are specifed to be
as if all refs under `$GIT_DIR/refs` are specified to be
included.
--window and --depth::
These two options affects how the objects contained in
--window=[N], --depth=[N]::
These two options affect how the objects contained in
the pack are stored using delta compression. The
objects are first internally sorted by type, size and
optionally names and compared against the other objects
@@ -84,6 +84,7 @@ base-name::
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.
--incremental::
This flag causes an object already in a pack ignored

View File

@@ -57,13 +57,14 @@ OPTIONS
`git update-server-info`.
--window=[N], --depth=[N]::
These two options affects how the objects contained in the pack are
These two options affect how the objects contained in the pack are
stored using delta compression. The objects are first internally
sorted by type, size and optionally names and compared against the
other objects within `--window` to see if using delta compression saves
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.
Author