Merge branch 'maint-1.6.0' into maint-1.6.1
commit66fd74ea5db13e6f095f7c414e9ea4a1aa59cdc7
authorJunio C Hamano <gitster@pobox.com>
Fri, 28 Aug 2009 03:41:31 +0000 (27 20:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 28 Aug 2009 03:41:31 +0000 (27 20:41 -0700)
tree20c6b4706eb2bd17cfdcacb6f52fbbba76caab0e
parent0d5055665ca1e76659ffa96bf972b4b0125ea069
parent82d97da30aba767e5c8406b595274af299858357
Merge branch 'maint-1.6.0' into maint-1.6.1

* maint-1.6.0:
  Documentation: git-archive: mark --format as optional in summary