diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-03-07 12:47:16 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-07 12:47:16 -0800 |
| commit | 27a23031056fbd540f7c34d78a3f097a3a7c211c (patch) | |
| tree | c73bdb50057530b35ed97c16377c836af7fc5217 | |
| parent | 0d1f2a56b1f83a6d298e5c03bfe76a47caa753c2 (diff) | |
| parent | 18879bc52668123d75f0e03e27d5e731bf9b40ee (diff) | |
| download | git-27a23031056fbd540f7c34d78a3f097a3a7c211c.tar.gz | |
Merge branch 'ne/pack-local-doc'
* 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 034caedc39..8ed09c0b3c 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 |