checkout,merge: loosen overwriting untracked file check based on info/exclude

diff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt
index 9ebbe9402b216d33fb7148f2f796d1f58d12cfd9..a3f56b07fd251cbd121c28189d1f9018b892b48e 100644 (file)
--- a/Documentation/git-cat-file.txt
+++ b/Documentation/git-cat-file.txt
@@ -27,7 +27,7 @@ OPTIONS
 <object>::
        The name of the object to show.
        For a more complete list of ways to spell object names, see
-       the "SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].
+       the "SPECIFYING REVISIONS" section in linkgit:gitrevisions[1].
 
 -t::
        Instead of the content, show the object type identified by