pack-objects: document --revs, --unpacked and --all.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt
index 4991f88c92b3d9f374f1a7e4a8aa8178a134f49f..d4661ddc2f84c1392b32ad3fdf5f4ebe5b465e00 100644 (file)
--- a/Documentation/git-pack-objects.txt
+++ b/Documentation/git-pack-objects.txt
@@ -11,7 +11,7 @@ SYNOPSIS
 [verse]
 'git-pack-objects' [-q] [--no-reuse-delta] [--non-empty]
        [--local] [--incremental] [--window=N] [--depth=N]
 [verse]
 'git-pack-objects' [-q] [--no-reuse-delta] [--non-empty]
        [--local] [--incremental] [--window=N] [--depth=N]

-       {--stdout | base-name} < object-list
+       [--revs [--unpacked | --all]*] [--stdout | base-name] < object-list

 
 
 DESCRIPTION
 
 
 DESCRIPTION


@@ -56,6 +56,24 @@ base-name::
        Write the pack contents (what would have been written to
        .pack file) out to the standard output.
 
        Write the pack contents (what would have been written to
        .pack file) out to the standard output.
 

+--revs::
+       Read the revision arguments from the standard input, instead of
+       individual object names.  The revision arguments are processed
+       the same way as gitlink:git-rev-list[1] with `--objects` flag
+       uses its `commit` arguments to build the list of objects it
+       outputs.  The objects on the resulting list are packed.
+
+--unpacked::
+       This implies `--revs`.  When processing the list of
+       revision arguments read from the standard input, limit
+       the objects packed to those that are not already packed.
+
+--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
+       included.
+

 --window and --depth::
        These two options affects how the objects contained in
        the pack are stored using delta compression.  The
 --window and --depth::
        These two options affects how the objects contained in
        the pack are stored using delta compression.  The


@@ -103,6 +121,7 @@ Documentation by Junio C Hamano
 
 See Also
 --------
 
 See Also
 --------

+gitlink:git-rev-list[1]

 gitlink:git-repack[1]
 gitlink:git-prune-packed[1]
 
 gitlink:git-repack[1]
 gitlink:git-prune-packed[1]
 

diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
index 753dd9a41400d9362bc668748c36f71e659f4f78..8d7a1209d5effe83eb93ad4d0f5088806d625c70 100644 (file)
--- a/builtin-pack-objects.c
+++ b/builtin-pack-objects.c
@@ -15,7 +15,7 @@
 #include <sys/time.h>
 #include <signal.h>
 
 #include <sys/time.h>
 #include <signal.h>
 

-static const char pack_usage[] = "git-pack-objects [-q] [--no-reuse-delta] [--non-empty] [--local] [--incremental] [--window=N] [--depth=N] {--stdout | base-name} [--revs [--unpacked | --all]* <ref-list | <object-list]";
+static const char pack_usage[] = "git-pack-objects [-q] [--no-reuse-delta] [--non-empty] [--local] [--incremental] [--window=N] [--depth=N] [--revs [--unpacked | --all]*] [--stdout | base-name] <ref-list | <object-list]";

 
 struct object_entry {
        unsigned char sha1[20];
 
 struct object_entry {
        unsigned char sha1[20];