summaryrefslogtreecommitdiffstats
path: root/git-pack-objects.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-11-14 08:26:31 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-11-14 08:26:31 +0000
commit283634923aa8f124696f3e9a77a012b96493c2d7 (patch)
tree3fe6cb2831bcd0b11ae6c10ba410d51f0e0af134 /git-pack-objects.html
parent9bd39c47653f45f81dbbe7210dbb55d738b3f5e7 (diff)
downloadgit-htmldocs-283634923aa8f124696f3e9a77a012b96493c2d7.tar.gz
Autogenerated HTML docs for v1.6.0.4-724-ga0d3a
Diffstat (limited to 'git-pack-objects.html')
-rw-r--r--git-pack-objects.html14
1 files changed, 12 insertions, 2 deletions
diff --git a/git-pack-objects.html b/git-pack-objects.html
index 51fefc115..1f676a999 100644
--- a/git-pack-objects.html
+++ b/git-pack-objects.html
@@ -464,6 +464,16 @@ base-name
</p>
</dd>
<dt>
+--honor-pack-keep
+</dt>
+<dd>
+<p>
+ 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.
+</p>
+</dd>
+<dt>
--incremental
</dt>
<dd>
@@ -479,7 +489,7 @@ base-name
<p>
This flag is similar to <tt>--incremental</tt>; instead of
ignoring all packed objects, it only ignores objects
- that are packed and not in the local object store
+ that are packed and/or not in the local object store
(i.e. borrowed from an alternate).
</p>
</dd>
@@ -628,7 +638,7 @@ base-name
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-10-31 11:28:43 UTC
+Last updated 2008-11-14 08:26:10 UTC
</div>
</div>
</body>