diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-03-08 00:36:00 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-08 00:36:00 -0800 |
| commit | 162b4643b6104ad61ecc8b47e431161966796d85 (patch) | |
| tree | 8b771e705ccfc3ecb5ab027230b8f92c130600af | |
| parent | 919451330b55366ac207e575c1982bc8fa5220ed (diff) | |
| parent | 18879bc52668123d75f0e03e27d5e731bf9b40ee (diff) | |
| download | git-162b4643b6104ad61ecc8b47e431161966796d85.tar.gz git-162b4643b6104ad61ecc8b47e431161966796d85.tar.xz | |
Merge branch 'ne/pack-local-doc' into maint
* ne/pack-local-doc:
pack-objects documentation: Fix --honor-pack-keep as well.
pack-objects documentation: reword "objects that appear in the standard input"
Documentation: pack-objects: Clarify --local's semantics.
| -rw-r--r-- | Documentation/git-pack-objects.txt | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt index 034caedc3..8ed09c0b3 100644 --- a/Documentation/git-pack-objects.txt +++ b/Documentation/git-pack-objects.txt @@ -115,18 +115,17 @@ base-name:: --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. + has a .keep file to be ignored, even if it it would have + otherwise been packed. --incremental:: - This flag causes an object already in a pack ignored - even if it appears in the standard input. + This flag causes an object already in a pack to be ignored + even if it would have otherwise been packed. --local:: - This flag is similar to `--incremental`; instead of - ignoring all packed objects, it only ignores objects - that are packed and/or not in the local object store - (i.e. borrowed from an alternate). + This flag causes an object that is borrowed from an alternate + object store to be ignored even if it would have otherwise been + packed. --non-empty:: Only create a packed archive if it would contain at |