Merge branch 'maint'

diff --git a/Documentation/git-unpack-objects.txt b/Documentation/git-unpack-objects.txt
index ae17cc2b44751fb57780a4b41be65fad1d65c1f8..dd7799095b4dd26a1625015f3fe0fcbd89dd0e70 100644 (file)
--- a/Documentation/git-unpack-objects.txt
+++ b/Documentation/git-unpack-objects.txt
@@ -21,7 +21,7 @@ Objects that already exist in the repository will *not* be unpacked
 from the pack-file.  Therefore, nothing will be unpacked if you use
 this command on a pack-file that exists within the target repository.
 
-Please see the `git-repack` documentation for options to generate
+See linkgit:git-repack[1] for options to generate
 new packs and replace existing ones.
 
 OPTIONS
@@ -43,15 +43,6 @@ OPTIONS
 --strict::
        Don't write objects with broken content or links.
 
-
-Author
-------
-Written by Linus Torvalds <torvalds@osdl.org>
-
-Documentation
--------------
-Documentation by Junio C Hamano
-
 GIT
 ---
 Part of the linkgit:git[1] suite