Merge branch 'master' of git://repo.or.cz/git-gui into maint

diff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt
index 7e90ce91bc4732a2f68e6ac2433f24d8cd3ecd62..075c0d05efca85c2357e09aa640aa4b7f0305419 100644 (file)
--- a/Documentation/git-cat-file.txt
+++ b/Documentation/git-cat-file.txt
@@ -19,7 +19,9 @@ or '-s' is used to find the object size.
 OPTIONS
 -------
 <object>::
-       The sha1 identifier of the object.
+       The name of the object to show.
+       For a more complete list of ways to spell object names, see
+       "SPECIFYING REVISIONS" section in gitlink:git-rev-parse[1].
 
 -t::
        Instead of the content, show the object type identified by