Merge branch 'master' into pb/gitpm

diff --git a/Documentation/tutorial-2.txt b/Documentation/tutorial-2.txt
index 82c692254e36e7aff597407633baeb2b5ee91a05..894ca5e06f26002f7dc5f2a16b713ca13e45886e 100644 (file)
--- a/Documentation/tutorial-2.txt
+++ b/Documentation/tutorial-2.txt
@@ -136,7 +136,7 @@ The "tree" object here refers to the new state of the tree:
 ------------------------------------------------
 $ git ls-tree d0492b36
 100644 blob a0423896973644771497bdc03eb99d5281615b51    file.txt
-$ git cat-file commit a0423896
+$ git cat-file blob a0423896
 hello world!
 ------------------------------------------------