Merge branch 'jc/cvsimport' into next

diff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt
index 48fb37769c2f4e528f143713125b3d6593d57c7d..504eb1b16a59c5af43fa1206723dece9207ee0eb 100644 (file)
--- a/Documentation/git-cat-file.txt
+++ b/Documentation/git-cat-file.txt
@@ -1,6 +1,5 @@
 git-cat-file(1)
 ===============
-v0.1, May 2005
 
 NAME
 ----
@@ -9,12 +8,13 @@ git-cat-file - Provide content or type information for repository objects
 
 SYNOPSIS
 --------
-'git-cat-file' (-t | <type>) <object>
+'git-cat-file' [-t | -s | -e | <type>] <object>
 
 DESCRIPTION
 -----------
 Provides content or type of objects in the repository. The type
-is required if '-t' is not being used to find the object type.
+is required unless '-t' is used to find the object type,
+or '-s' is used to find the object size.
 
 OPTIONS
 -------
@@ -25,9 +25,17 @@ OPTIONS
        Instead of the content, show the object type identified by
        <object>.
 
+-s::
+       Instead of the content, show the object size identified by
+       <object>.
+
+-e::
+       Suppress all output; instead exit with zero status if <object>
+       exists and is a valid object.
+
 <type>::
        Typically this matches the real type of <object> but asking
-       for a type that can trivially dereferenced from the given
+       for a type that can trivially be dereferenced from the given
        <object> is also permitted.  An example is to ask for a
        "tree" with <object> being a commit object that contains it,
        or to ask for a "blob" with <object> being a tag object that
@@ -37,6 +45,10 @@ OUTPUT
 ------
 If '-t' is specified, one of the <type>.
 
+If '-s' is specified, the size of the <object> in bytes.
+
+If '-e' is specified, no output.
+
 Otherwise the raw (though uncompressed) contents of the <object> will
 be returned.
 
@@ -51,5 +63,5 @@ 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 gitlink:git[7] suite