CodingGuidelines: once it is in, it is not worth the code churn

diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt
index 5375549820bd6b9fecf3540b1e60ae50e74da0e6..056c0dba81292ae63fedf2d911bce8f5fa3f7d19 100644 (file)
--- a/Documentation/git-read-tree.txt
+++ b/Documentation/git-read-tree.txt
@@ -57,7 +57,7 @@ OPTIONS
 -n::
 --dry-run::
        Check if the command would error out, without updating the index
-       nor the files in the working tree for real.
+       or the files in the working tree for real.
 
 -v::
        Show the progress of checking files out.
@@ -83,11 +83,10 @@ OPTIONS
 
 --prefix=<prefix>/::
        Keep the current index contents, and read the contents
-       of the named tree-ish under the directory at `<prefix>`. The
-       original index file cannot have anything at the path
-       `<prefix>` itself, nor anything in the `<prefix>/`
-       directory.  Note that the `<prefix>/` value must end
-       with a slash.
+       of the named tree-ish under the directory at `<prefix>`.
+       The command will refuse to overwrite entries that already
+       existed in the original index file. Note that the `<prefix>/`
+       value must end with a slash.
 
 --exclude-per-directory=<gitignore>::
        When running the command with `-u` and `-m` options, the
@@ -342,7 +341,7 @@ since you pulled from him:
 
 ----------------
 $ git fetch git://.... linus
-$ LT=`cat .git/FETCH_HEAD`
+$ LT=`git rev-parse FETCH_HEAD`
 ----------------
 
 Your work tree is still based on your HEAD ($JC), but you have