Merge branch 'nd/count-garbage'
authorJunio C Hamano <gitster@pobox.com>
Thu, 21 Mar 2013 21:02:34 +0000 (14:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 21 Mar 2013 21:02:34 +0000 (14:02 -0700)
"git count-objects -v" did not count leftover temporary packfiles
and other kinds of garbage.

* nd/count-garbage:
count-objects: report how much disk space taken by garbage files
count-objects: report garbage files in pack directory too
sha1_file: reorder code in prepare_packed_git_one()
git-count-objects.txt: describe each line in -v output

1  2 
cache.h
diff --cc cache.h
Simple merge