Merge branch 'master' into jc/fmt-patch

diff --git a/Documentation/git-unpack-objects.txt b/Documentation/git-unpack-objects.txt
index a42a75e0773384aacec4d1c05c3a1d86aec01e6a..18280628a15510d098faf0289fbf61bae7e1d688 100644 (file)
--- a/Documentation/git-unpack-objects.txt
+++ b/Documentation/git-unpack-objects.txt
@@ -1,15 +1,14 @@
 git-unpack-objects(1)
 =====================
-v0.1, July 2005
 
 NAME
 ----
-git-unpack-objects - Unpack objects from a packed archive.
+git-unpack-objects - Unpack objects from a packed archive
 
 
 SYNOPSIS
 --------
-'git-unpack-objects' [-q] <pack-file
+'git-unpack-objects' [-n] [-q] <pack-file
 
 
 DESCRIPTION
@@ -20,6 +19,10 @@ one-object" format in $GIT_OBJECT_DIRECTORY.
 
 OPTIONS
 -------
+-n::
+        Only list the objects that would be unpacked, don't actually unpack
+        them.
+
 -q::
        The command usually shows percentage progress.  This
        flag suppresses it.
@@ -35,5 +38,5 @@ Documentation by Junio C Hamano
 
 GIT
 ---
-Part of the link:git.html[git] suite
+Part of the gitlink:git[7] suite