From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 28 Aug 2009 05:01:01 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.5-rc0~29
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=aab9ea1aad2447522928d7e9af0bb030558012cb;p=git.git

Merge branch 'maint'

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

aab9ea1aad2447522928d7e9af0bb030558012cb