merge-recursive --renormalize

diff --git a/Documentation/git-unpack-file.txt b/Documentation/git-unpack-file.txt
index 20bb6a7800c43c6613aaeda2a86cd3311213bfbe..995db9feadf68df6f22de745d90790a145128e44 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
 -----------
@@ -32,4 +32,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[1] suite