Merge branch 'master' into next
commit7a9110bf73c76166323288d631c720c3392837c6
authorJunio C Hamano <gitster@pobox.com>
Wed, 20 Aug 2008 07:45:44 +0000 (20 00:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 20 Aug 2008 07:45:44 +0000 (20 00:45 -0700)
tree7bdc50405a09e5048aba875fca3013960278bfe9
parent2fad1ef69ea50e7d9a61a65603ad04bcc079ac0e
parent3814c07498f87e7d27b55175ca2852fcc4cd27f4
Merge branch 'master' into next

* master:
  reword --full-index description
  SubmittingPatches: fix a typo
  add boolean diff.suppress-blank-empty config option
  Revert "Windows: Use a customized struct stat that also has the st_blocks member."
  compat: introduce on_disk_bytes()
Makefile
builtin-count-objects.c