aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-count-objects.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-04-09 12:03:26 -0700
committerJunio C Hamano <gitster@pobox.com>2014-04-09 12:03:26 -0700
commit3c9e56b75c4a9a6832d94a00f079ea68e8a281ca (patch)
tree5f5b11703f64319bcb71603c825d382f4703a763 /Documentation/git-count-objects.txt
parentfbae3d9ace0b71f8db62cde127fa6fe24c40380c (diff)
parent235e8d591480d7e1378c27fe65c5529625d4b5be (diff)
downloadgit-3c9e56b75c4a9a6832d94a00f079ea68e8a281ca.tar.xz
Merge branch 'jl/nor-or-nand-and' into maint
* jl/nor-or-nand-and: code and test: fix misuses of "nor" comments: fix misuses of "nor" contrib: fix misuses of "nor" Documentation: fix misuses of "nor"
Diffstat (limited to 'Documentation/git-count-objects.txt')
-rw-r--r--Documentation/git-count-objects.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-count-objects.txt b/Documentation/git-count-objects.txt
index b300e846f1..2ff35683e5 100644
--- 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)