Merge branch 'rr/doc-content-type' into maint

diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt
index 96684bc51003485974424d1b00d060a7f8e5e59e..20c8551d6a2b3483cfea6669511192583c03e682 100644 (file)
--- a/Documentation/git-pack-objects.txt
+++ b/Documentation/git-pack-objects.txt
@@ -115,7 +115,7 @@ 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 it would have
+       has a .keep file to be ignored, even if it would have
        otherwise been packed.
 
 --incremental::
@@ -224,15 +224,6 @@ So does `git bundle` (see linkgit:git-bundle[1]) when it creates a bundle.
        With this option, parents that are hidden by grafts are packed
        nevertheless.
 
-
-Author
-------
-Written by Linus Torvalds <torvalds@osdl.org>
-
-Documentation
--------------
-Documentation by Junio C Hamano
-
 SEE ALSO
 --------
 linkgit:git-rev-list[1]