Merge branch 'maint-1.6.1' into maint-1.6.2
commit891182f9141326fd6833d3651b89860a0b41f153
authorJunio C Hamano <gitster@pobox.com>
Fri, 28 Aug 2009 03:41:37 +0000 (27 20:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 28 Aug 2009 03:41:37 +0000 (27 20:41 -0700)
tree72fdca8e7ad2b9a0be9098c980d6e741b91eb745
parent607a9e8aaa9b1a18f81ae67e40a5c8a5d1a92577
parent66fd74ea5db13e6f095f7c414e9ea4a1aa59cdc7
Merge branch 'maint-1.6.1' into maint-1.6.2

* maint-1.6.1:
  Documentation: git-archive: mark --format as optional in summary
Documentation/git-archive.txt