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
This commit is contained in:
Junio C Hamano
2009-08-27 20:42:38 -07:00
4 changed files with 4 additions and 4 deletions

View File

@ -376,7 +376,7 @@ sub gitweb_get_feature {
@{$feature{$name}{'default'}});
if (!$override) { return @defaults; }
if (!defined $sub) {
warn "feature $name is not overrideable";
warn "feature $name is not overridable";
return @defaults;
}
return $sub->(@defaults);