merge-recursive --renormalize

diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt
index 769f1de6b67c5e02b241b840560f81972cc490f0..8ed09c0b3cfc0fff2dbb8907fdc00e027c2c6d33 100644 (file)
--- a/Documentation/git-pack-objects.txt
+++ b/Documentation/git-pack-objects.txt
@@ -115,17 +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 to be ignored
-       even if it appears in the standard input.
+       even if it would have otherwise been packed.
 
 --local::
        This flag causes an object that is borrowed from an alternate
-       object store to be ignored even if it appears in the standard
-       input.
+       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