diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-27 02:43:46 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-27 02:43:46 -0800 |
| commit | 37818d7db070f67a20df58ac7d5e04cc63ef1867 (patch) | |
| tree | 1b1b2b71afab1c4ad29666f56fa8d2560b7855c6 /Documentation/git-count-objects.txt | |
| parent | 4bcb310c2539b66d535e87508d1b7a90fe29c083 (diff) | |
| parent | ae72f685418b79bbd67e1017c5b1ac7d731c042e (diff) | |
| download | git-37818d7db070f67a20df58ac7d5e04cc63ef1867.tar.gz | |
Merge branch 'master' into js/shallow
This is to adjust to:
count-objects -v: show number of packs as well.
which will break a test in this series.
Signed-off-by: Junio C Hamano <junkio@cox.net>
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 198ce77a8a..c59df6438c 100644 --- a/Documentation/git-count-objects.txt +++ b/Documentation/git-count-objects.txt @@ -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 |