pack-objects: document --delta-base-offset option

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

diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt
index d4661ddc2f84c1392b32ad3fdf5f4ebe5b465e00..57887097108a6df5525eba3edd634fa61ceb8fd9 100644 (file)
--- a/Documentation/git-pack-objects.txt
+++ b/Documentation/git-pack-objects.txt
@@ -9,7 +9,7 @@ git-pack-objects - Create a packed archive of objects
 SYNOPSIS
 --------
 [verse]
 SYNOPSIS
 --------
 [verse]

-'git-pack-objects' [-q] [--no-reuse-delta] [--non-empty]
+'git-pack-objects' [-q] [--no-reuse-delta] [--delta-base-offset] [--non-empty]

        [--local] [--incremental] [--window=N] [--depth=N]
        [--revs [--unpacked | --all]*] [--stdout | base-name] < object-list
 
        [--local] [--incremental] [--window=N] [--depth=N]
        [--revs [--unpacked | --all]*] [--stdout | base-name] < object-list
 


@@ -110,6 +110,17 @@ base-name::
        This flag tells the command not to reuse existing deltas
        but compute them from scratch.
 
        This flag tells the command not to reuse existing deltas
        but compute them from scratch.
 

+--delta-base-offset::
+       A packed archive can express base object of a delta as
+       either 20-byte object name or as an offset in the
+       stream, but older version of git does not understand the
+       latter.  By default, git-pack-objects only uses the
+       former format for better compatibility.  This option
+       allows the command to use the latter format for
+       compactness.  Depending on the average delta chain
+       length, this option typically shrinks the resulting
+       packfile by 3-5 per-cent.
+

 
 Author
 ------
 
 Author
 ------

diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
index ee5f031bc2d3ead1027b56884c1d5a1fd69756aa..41e1e74533d64e999ec1e564e15b8dea29e4c9c6 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] [--revs [--unpacked | --all]*] [--stdout | base-name] <ref-list | <object-list]";
+static const char pack_usage[] = "git-pack-objects [-q] [--no-reuse-delta] [--delta-base-offset] [--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];