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:
@ -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);
|
||||
|
Reference in New Issue
Block a user