Merge branch 'maint-1.6.2' into maint-1.6.3
authorJunio C Hamano <gitster@pobox.com>
Fri, 28 Aug 2009 03:42:38 +0000 (20:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 28 Aug 2009 03:42:38 +0000 (20:42 -0700)
* maint-1.6.2:
Fix overridable written with an extra 'e'
Documentation: git-archive: mark --format as optional in summary
Round-down years in "years+months" relative date view

Conflicts:
Documentation/git-archive.txt

No differences found