Skip to content

Commit 162b464

Browse files
committed
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.
2 parents 9194513 + 18879bc commit 162b464

1 file changed

Lines changed: 7 additions & 8 deletions

File tree

Documentation/git-pack-objects.txt

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -115,18 +115,17 @@ base-name::
115115

116116
--honor-pack-keep::
117117
This flag causes an object already in a local pack that
118-
has a .keep file to be ignored, even if it appears in the
119-
standard input.
118+
has a .keep file to be ignored, even if it it would have
119+
otherwise been packed.
120120

121121
--incremental::
122-
This flag causes an object already in a pack ignored
123-
even if it appears in the standard input.
122+
This flag causes an object already in a pack to be ignored
123+
even if it would have otherwise been packed.
124124

125125
--local::
126-
This flag is similar to `--incremental`; instead of
127-
ignoring all packed objects, it only ignores objects
128-
that are packed and/or not in the local object store
129-
(i.e. borrowed from an alternate).
126+
This flag causes an object that is borrowed from an alternate
127+
object store to be ignored even if it would have otherwise been
128+
packed.
130129

131130
--non-empty::
132131
Only create a packed archive if it would contain at

0 commit comments

Comments
 (0)