Merge branch 'sg/complete-symmetric-diff'

diff --git a/Documentation/git-unpack-file.txt b/Documentation/git-unpack-file.txt
index 20bb6a7800c43c6613aaeda2a86cd3311213bfbe..c49d727f7463446c4182807cbd9077db5e34007f 100644 (file)
--- a/Documentation/git-unpack-file.txt
+++ b/Documentation/git-unpack-file.txt
@@ -9,7 +9,7 @@ git-unpack-file - Creates a temporary file with a blob's contents
 
 SYNOPSIS
 --------
-'git-unpack-file' <blob>
+'git unpack-file' <blob>
 
 DESCRIPTION
 -----------
@@ -22,14 +22,6 @@ OPTIONS
 <blob>::
        Must be a blob id
 
-Author
-------
-Written by Linus Torvalds <torvalds@osdl.org>
-
-Documentation
---------------
-Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
-
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[1] suite