summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikolai Weibull <mailing-lists.git@rawuncut.elitemail.org>2005-12-08 23:28:05 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-12-08 23:50:13 (GMT)
commit63ae26f87ae1d3a95a8ecc2fc761b7a7987e3ce5 (patch)
tree07813bb81e58f0446375f2bd7f44cd65291aa960
parentbcaf60b25b6f62049f195e253d6a974b42442066 (diff)
downloadgit-63ae26f87ae1d3a95a8ecc2fc761b7a7987e3ce5.zip
git-63ae26f87ae1d3a95a8ecc2fc761b7a7987e3ce5.tar.gz
git-63ae26f87ae1d3a95a8ecc2fc761b7a7987e3ce5.tar.bz2
Document the --non-empty command-line option to git-pack-objects.
This provides (minimal) documentation for the --non-empty command-line option to the pack-objects command. Signed-off-by: Nikolai Weibull <nikolai@bitwi.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--Documentation/git-pack-objects.txt6
-rw-r--r--pack-objects.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt
index d1e93db..009ec5a 100644
--- a/Documentation/git-pack-objects.txt
+++ b/Documentation/git-pack-objects.txt
@@ -8,7 +8,7 @@ git-pack-objects - Create a packed archive of objects.
SYNOPSIS
--------
-'git-pack-objects' [--local] [--incremental] [--window=N] [--depth=N] {--stdout | base-name} < object-list
+'git-pack-objects' [--non-empty] [--local] [--incremental] [--window=N] [--depth=N] {--stdout | base-name} < object-list
DESCRIPTION
@@ -70,6 +70,10 @@ base-name::
that are packed and not in the local object store
(i.e. borrowed from an alternate).
+--non-empty::
+ Only create a packed archive if it would contain at
+ least one object.
+
Author
------
Written by Linus Torvalds <torvalds@osdl.org>
diff --git a/pack-objects.c b/pack-objects.c
index a62c9f8..caf3b6b 100644
--- a/pack-objects.c
+++ b/pack-objects.c
@@ -4,7 +4,7 @@
#include "pack.h"
#include "csum-file.h"
-static const char pack_usage[] = "git-pack-objects [--local] [--incremental] [--window=N] [--depth=N] {--stdout | base-name} < object-list";
+static const char pack_usage[] = "git-pack-objects [--non-empty] [--local] [--incremental] [--window=N] [--depth=N] {--stdout | base-name} < object-list";
struct object_entry {
unsigned char sha1[20];