From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 28 Aug 2009 03:42:38 +0000 (-0700)
Subject: Merge branch 'maint-1.6.2' into maint-1.6.3
X-Git-Tag: v1.6.4.2~4^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5e64650d938d7a23b73532b4a68bc6bd08cfd041?hp=5e64650d938d7a23b73532b4a68bc6bd08cfd041

Merge branch 'maint-1.6.2' into maint-1.6.3

* 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
---