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

diff --git a/Documentation/git-shortlog.txt b/Documentation/git-shortlog.txt
index 36510a845125a806992fddce125883a749569235..c7752575d8f5f35657cb9ef5a7e9e18b82ddc8b8 100644 (file)
--- a/Documentation/git-shortlog.txt
+++ b/Documentation/git-shortlog.txt
@@ -59,4 +59,4 @@ Documentation by Junio C Hamano.
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite