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

diff --git a/Documentation/git-count-objects.txt b/Documentation/git-count-objects.txt
index 198ce77a8a541ba33855bf5236b4791e2b395557..7fb08e93485b9e4bf0a1e249944ab814b00abb27 100644 (file)
--- a/Documentation/git-count-objects.txt
+++ b/Documentation/git-count-objects.txt
@@ -3,7 +3,7 @@ git-count-objects(1)
 
 NAME
 ----
-git-count-objects - Reports on unpacked objects
+git-count-objects - Count unpacked number of objects and their disk consumption
 
 SYNOPSIS
 --------
@@ -20,8 +20,8 @@ OPTIONS
 -v::
        In addition to the number of loose objects and disk
        space consumed, it reports the number of in-pack
-       objects, and number of objects that can be removed by
-       running `git-prune-packed`.
+       objects, number of packs, and number of objects that can be
+       removed by running `git-prune-packed`.
 
 
 Author
@@ -34,5 +34,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