Merge branch 'sb/atomic-push' into mh/ref-trans-value-check

diff --git a/Documentation/git-count-objects.txt b/Documentation/git-count-objects.txt
index b300e846f13d6a7f340286b4624dc3b0da4ac740..2ff35683e5daac368f959ad6f53d22a77d0d5185 100644 (file)
--- a/Documentation/git-count-objects.txt
+++ b/Documentation/git-count-objects.txt
@@ -33,8 +33,8 @@ size-pack: disk space consumed by the packs, in KiB (unless -H is specified)
 prune-packable: the number of loose objects that are also present in
 the packs. These objects could be pruned using `git prune-packed`.
 +
-garbage: the number of files in object database that are not valid
-loose objects nor valid packs
+garbage: the number of files in object database that are neither valid loose
+objects nor valid packs
 +
 size-garbage: disk space consumed by garbage files, in KiB (unless -H is
 specified)