mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
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.
This commit is contained in:
commit
162b4643b6
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue