Merge branch 'master' into next

diff --git a/Documentation/git-pack-redundant.txt b/Documentation/git-pack-redundant.txt
index 55c0d48bf1d64320c7e688987c663033a8ce2179..9fe86aef98e023e336e10b7352d914ff2f7f6a7d 100644 (file)
--- a/Documentation/git-pack-redundant.txt
+++ b/Documentation/git-pack-redundant.txt
@@ -8,7 +8,7 @@ git-pack-redundant - Program used to find redundant pack files.
 
 SYNOPSIS
 --------
-'git-pack-redundant [ -v ] < -a | .pack filename ... >'
+'git-pack-redundant [ --verbose ] [ --alt-odb ] < --all | .pack filename ... >'
 
 DESCRIPTION
 -----------
@@ -16,24 +16,35 @@ This program computes which packs in your repository
 are redundant. The output is suitable for piping to
 'xargs rm' if you are in the root of the repository.
 
+git-pack-redundant accepts a list of objects on standard input. Any objects
+given will be ignored when checking which packs are required. This makes the 
+following command useful when wanting to remove packs which contain unreachable
+objects.
+
+git-fsck-objects --full --unreachable | cut -d ' ' -f3 | \
+git-pack-redundant --all | xargs rm
+
 OPTIONS
 -------
 
--v::
-       Verbose. Outputs some statistics to stderr.
-       Has a small performance penalty.
 
--a::
-       All. Processes all the local packs. Any filenames on
-       the commandline are ignored.
+--all::
+       Processes all packs. Any filenames on the commandline are ignored.
+
+--alt-odb::
+       Don't require objects present in packs from alternate object
+       directories to be present in local packs.
+
+--verbose::
+       Outputs some statistics to stderr. Has a small performance penalty.
 
 Author
 ------
-Written by Lukas Sandström <lukass@etek.chalmers.se>
+Written by Lukas Sandström <lukass@etek.chalmers.se>
 
 Documentation
 --------------
-Documentation by Lukas Sandström <lukass@etek.chalmers.se>
+Documentation by Lukas Sandström <lukass@etek.chalmers.se>
 
 See-Also
 --------