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

diff --git a/Documentation/git-patch-id.txt b/Documentation/git-patch-id.txt
index ad528a922487be06207bdcc38a03fe55fd0f2a5d..894852a78b9c63e0be80af2c3b86c22f998a2b01 100644 (file)
--- a/Documentation/git-patch-id.txt
+++ b/Documentation/git-patch-id.txt
@@ -39,4 +39,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite