rebase: Support preserving merges in non-interactive mode

diff --git a/Documentation/git-unpack-file.txt b/Documentation/git-unpack-file.txt
index 2f2130d511735e2bb8709bfb8f5b9ad15e6a6150..995db9feadf68df6f22de745d90790a145128e44 100644 (file)
--- a/Documentation/git-unpack-file.txt
+++ b/Documentation/git-unpack-file.txt
@@ -1,6 +1,5 @@
 git-unpack-file(1)
 ==================
-v0.1, May 2005
 
 NAME
 ----
@@ -10,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
 -----------
@@ -33,5 +32,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the link:git.html[git] suite
-
+Part of the linkgit:git[1] suite