From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 24 Nov 2010 20:45:07 +0000 (-0800)
Subject: Merge branch 'jk/repack-reuse-object' into maint
X-Git-Tag: v1.7.3.3~25
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/be0a4c820094c72cff67b69de8ba7ce88145ce86?ds=inline;hp=-c

Merge branch 'jk/repack-reuse-object' into maint

* jk/repack-reuse-object:
Documentation: pack.compression: explain how to recompress
repack: add -F flag to let user choose between --no-reuse-delta/object

Conflicts:
Documentation/git-repack.txt
---

be0a4c820094c72cff67b69de8ba7ce88145ce86
diff --combined Documentation/config.txt
index 7f6b2109bd,ad81df3370..e6a8f27f26
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -1466,6 -1466,10 +1466,10 @@@ pack.compression:
  	not set,  defaults to -1, the zlib default, which is "a default
  	compromise between speed and compression (currently equivalent
  	to level 6)."
+ +
+ Note that changing the compression level will not automatically recompress
+ all existing objects. You can force recompression by passing the -F option
+ to linkgit:git-repack[1].
  
  pack.deltaCacheSize::
  	The maximum memory in bytes used for caching deltas in
@@@ -1550,12 -1554,12 +1554,12 @@@ push.default:
  	no refspec is implied by any of the options given on the command
  	line. Possible values are:
  +
 -* `nothing` do not push anything.
 -* `matching` push all matching branches.
 +* `nothing` - do not push anything.
 +* `matching` - push all matching branches.
    All branches having the same name in both ends are considered to be
    matching. This is the default.
 -* `tracking` push the current branch to its upstream branch.
 -* `current` push the current branch to a branch of the same name.
 +* `tracking` - push the current branch to its upstream branch.
 +* `current` - push the current branch to a branch of the same name.
  
  rebase.stat::
  	Whether to show a diffstat of what changed upstream since the last
@@@ -1755,9 -1759,9 +1759,9 @@@ status.showUntrackedFiles:
  	the untracked files. Possible values are:
  +
  --
 -	- 'no'     - Show no untracked files
 -	- 'normal' - Shows untracked files and directories
 -	- 'all'    - Shows also individual files in untracked directories.
 +* `no` - Show no untracked files.
 +* `normal` - Show untracked files and directories.
 +* `all` - Show also individual files in untracked directories.
  --
  +
  If this variable is not specified, it defaults to 'normal'.
diff --combined Documentation/git-repack.txt
index af79b86516,9566727f7a..27f7865b06
--- a/Documentation/git-repack.txt
+++ b/Documentation/git-repack.txt
@@@ -8,7 -8,7 +8,7 @@@ git-repack - Pack unpacked objects in 
  
  SYNOPSIS
  --------
- 'git repack' [-a] [-A] [-d] [-f] [-l] [-n] [-q] [--window=<n>] [--depth=<n>]
 -'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [--window=N] [--depth=N]
++'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [--window=<n>] [--depth=<n>]
  
  DESCRIPTION
  -----------
@@@ -62,6 -62,10 +62,10 @@@ other objects in that pack they alread
  	linkgit:git-pack-objects[1].
  
  -f::
+ 	Pass the `--no-reuse-delta` option to `git-pack-objects`, see
+ 	linkgit:git-pack-objects[1].
+ 
+ -F::
  	Pass the `--no-reuse-object` option to `git-pack-objects`, see
  	linkgit:git-pack-objects[1].
  
@@@ -76,8 -80,8 +80,8 @@@
  	this repository (or a direct copy of it)
  	over HTTP or FTP.  See linkgit:git-update-server-info[1].
  
 ---window=[N]::
 ---depth=[N]::
 +--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
@@@ -87,10 -91,10 +91,10 @@@
  	to be applied that many times to get to the necessary object.
  	The default value for --window is 10 and --depth is 50.
  
 ---window-memory=[N]::
 +--window-memory=<n>::
  	This option provides an additional limit on top of `--window`;
  	the window size will dynamically scale down so as to not take
 -	up more than N bytes in memory.  This is useful in
 +	up more than '<n>' bytes in memory.  This is useful in
  	repositories with a mix of large and small objects to not run
  	out of memory with a large window, but still be able to take
  	advantage of the large window for the smaller objects.  The
@@@ -98,7 -102,7 +102,7 @@@
  	`--window-memory=0` makes memory usage unlimited, which is the
  	default.
  
 ---max-pack-size=[N]::
 +--max-pack-size=<n>::
  	Maximum size of each output pack file. The size can be suffixed with
  	"k", "m", or "g". The minimum size allowed is limited to 1 MiB.
  	If specified,  multiple packfiles may be created.