summaryrefslogtreecommitdiff
path: root/Documentation/git-pack-objects.txt
diff options
context:
space:
mode:
authorBrandon Casey <casey@nrlssc.navy.mil>2008-11-12 11:59:04 -0600
committerJunio C Hamano <gitster@pobox.com>2008-11-12 10:28:10 -0800
commite96fb9b8f90f907d720ea6b71c92e30c2b071f4a (patch)
tree8dfb0c63ec17c87db1be7577ca1dc70ae2f42d6e /Documentation/git-pack-objects.txt
parent8d25931d6ff47a7fb06512d767d1d416d9bc7733 (diff)
downloadgit-e96fb9b8f90f907d720ea6b71c92e30c2b071f4a.tar.gz
pack-objects: new option --honor-pack-keep
This adds a new option to pack-objects which will cause it to ignore an object which appears in a local pack which has a .keep file, even if it was specified for packing. This option will be used by the porcelain repack. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-pack-objects.txt')
-rw-r--r--Documentation/git-pack-objects.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt
index 8c354bd470..f9fac2ccf9 100644
--- a/Documentation/git-pack-objects.txt
+++ b/Documentation/git-pack-objects.txt
@@ -109,6 +109,11 @@ base-name::
The default is unlimited, unless the config variable
`pack.packSizeLimit` is set.
+--honor-pack-keep::
+ This flag causes an object already in a local pack that
+ has a .keep file to be ignored, even if it appears in the
+ standard input.
+
--incremental::
This flag causes an object already in a pack ignored
even if it appears in the standard input.