Merge branch 'jc/maint-add-u-remove-conflicted'

diff --git a/Documentation/git-count-objects.txt b/Documentation/git-count-objects.txt
index c069cc8b04a63084856b60814669457c95dac2db..6bc1c21e6283284e2eae16d7ec4cb8183d8e0851 100644 (file)
--- a/Documentation/git-count-objects.txt
+++ b/Documentation/git-count-objects.txt
@@ -21,13 +21,14 @@ OPTIONS
 --verbose::
        In addition to the number of loose objects and disk
        space consumed, it reports the number of in-pack
-       objects, number of packs, and number of objects that can be
-       removed by running `git prune-packed`.
+       objects, number of packs, disk space consumed by those packs,
+       and number of objects that can be removed by running
+       `git prune-packed`.
 
 
 Author
 ------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
 
 Documentation
 --------------