From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 28 Aug 2009 03:42:42 +0000 (-0700)
Subject: Merge branch 'maint-1.6.3' into maint
X-Git-Tag: v1.6.4.2~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=749086fa090d81c10ebf16b1abfd138c3fa0232e;p=git.git

Merge branch 'maint-1.6.3' into maint

* maint-1.6.3:
  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
---

749086fa090d81c10ebf16b1abfd138c3fa0232e