diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-04-08 12:00:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-08 12:00:28 -0700 |
| commit | d59c12d7ad39f942fc60578ba1e934822f40445b (patch) | |
| tree | f0591d6490164e7a8a672c79094a2d612899cfb7 /Documentation/git-count-objects.txt | |
| parent | 9b30a0339db28e6de9653b5631247d398cce626c (diff) | |
| parent | 235e8d591480d7e1378c27fe65c5529625d4b5be (diff) | |
| download | git-d59c12d7ad39f942fc60578ba1e934822f40445b.tar.gz git-d59c12d7ad39f942fc60578ba1e934822f40445b.tar.xz | |
Merge branch 'jl/nor-or-nand-and'
Eradicate mistaken use of "nor" (that is, essentially "nor" used
not in "neither A nor B" ;-)) from in-code comments, command output
strings, and documentations.
* 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.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-count-objects.txt b/Documentation/git-count-objects.txt index b300e846f..2ff35683e 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) |