Tutorial: do not use 'git resolve'.

diff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt
index 2131a29993405742fcc67ed81a578c06bf950f44..ab4dcae21caa190a41c19ec24b4dc2d71a5a73fb 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
 ----
@@ -32,7 +31,7 @@ OPTIONS
 
 <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
@@ -57,5 +56,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