Merge branch 'jn/fix-abbrev' into maint

diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt
index 1deaa6501ed2be57c393a6f3635c0f8318002365..8ed09c0b3cfc0fff2dbb8907fdc00e027c2c6d33 100644 (file)
--- a/Documentation/git-pack-objects.txt
+++ b/Documentation/git-pack-objects.txt
@@ -115,8 +115,8 @@ 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