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

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 683a53a0be27fda7ab90b02e34faddc20dd8b460..c5e094a9c4a31568e4efb2c70af7e7808ae63528 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -896,15 +896,15 @@ remote.<name>.skipDefaultUpdate::
 
 remote.<name>.receivepack::
        The default program to execute on the remote side when pushing.  See
-       option \--exec of linkgit:git-push[1].
+       option \--receive-pack of linkgit:git-push[1].
 
 remote.<name>.uploadpack::
        The default program to execute on the remote side when fetching.  See
-       option \--exec of linkgit:git-fetch-pack[1].
+       option \--upload-pack of linkgit:git-fetch-pack[1].
 
 remote.<name>.tagopt::
-       Setting this value to --no-tags disables automatic tag following when fetching
-       from remote <name>
+       Setting this value to \--no-tags disables automatic tag following when
+       fetching from remote <name>
 
 remotes.<group>::
        The list of remotes which are fetched by "git remote update