Merge branch 'jc/delta' into next

diff --git a/Documentation/git-unpack-objects.txt b/Documentation/git-unpack-objects.txt
index a12b8438bfd67df7fdee520fd039a9b39415d3bb..31ea34d2292a2eb31ec4532c021c11c7e0de3d99 100644 (file)
--- a/Documentation/git-unpack-objects.txt
+++ b/Documentation/git-unpack-objects.txt
@@ -1,6 +1,5 @@
 git-unpack-objects(1)
 =====================
-v0.1, July 2005
 
 NAME
 ----
@@ -9,7 +8,7 @@ git-unpack-objects - Unpack objects from a packed archive.
 
 SYNOPSIS
 --------
-'git-unpack-objects' < pack-file
+'git-unpack-objects' [-n] [-q] <pack-file
 
 
 DESCRIPTION
@@ -18,6 +17,16 @@ Reads a packed archive (.pack) from the standard input, and
 expands the objects contained in the pack into "one-file
 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.
+
 
 Author
 ------
@@ -29,5 +38,5 @@ Documentation by Junio C Hamano
 
 GIT
 ---
-Part of the link:git.html[git] suite
+Part of the gitlink:git[7] suite