undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ne/pack-local-doc'

Browse Source 
* 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.
This commit is contained in:
Junio C Hamano 2010-03-07 12:47:16 -08:00
commit 27a2303105
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Documentation/git-pack-objects.txt
View File

@ -115,18 +115,17 @@ base-name::
--honor-pack-keep:: --honor-pack-keep::
This flag causes an object already in a local pack that This flag causes an object already in a local pack that
has a .keep file to be ignored, even if it appears in the has a .keep file to be ignored, even if it it would have
standard input. otherwise been packed.
--incremental:: --incremental::
This flag causes an object already in a pack ignored This flag causes an object already in a pack to be ignored
even if it appears in the standard input. even if it would have otherwise been packed.
--local:: --local::
This flag is similar to `--incremental`; instead of This flag causes an object that is borrowed from an alternate
ignoring all packed objects, it only ignores objects object store to be ignored even if it would have otherwise been
that are packed and/or not in the local object store packed.
(i.e. borrowed from an alternate).
--non-empty:: --non-empty::
Only create a packed archive if it would contain at Only create a packed archive if it would contain at