git-p4: Unset P4DIFF environment variable when using 'p4 -du diff'

diff --git a/Documentation/git-clean.txt b/Documentation/git-clean.txt
index 5aff026eb489a84640ffef6c8deed5b9f89e2b06..5e9da036ba5ce14c0b7fb6f1b9ff8389af4770e4 100644 (file)
--- a/Documentation/git-clean.txt
+++ b/Documentation/git-clean.txt
@@ -26,7 +26,7 @@ OPTIONS
        Remove untracked directories in addition to untracked files.
 
 -f::
-       If the git configuration specifies clean.forceRequire as true,
+       If the git configuration specifies clean.requireForce as true,
        git-clean will refuse to run unless given -f or -n.
 
 -n::
@@ -39,7 +39,7 @@ OPTIONS
 -x::
        Don't use the ignore rules.  This allows removing all untracked
        files, including build products.  This can be used (possibly in
-       conjunction with gitlink:git-reset[1]) to create a pristine
+       conjunction with linkgit:git-reset[1]) to create a pristine
        working directory to test a clean build.
 
 -X::
@@ -54,4 +54,4 @@ Written by Pavel Roskin <proski@gnu.org>
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite