diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-08-27 20:42:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-27 20:42:42 -0700 |
| commit | 749086fa090d81c10ebf16b1abfd138c3fa0232e (patch) | |
| tree | a65d08d7e5f8f66a2f4cec1c1ad729db1ee3d183 /gitweb | |
| parent | d8526a4c3b31d91b623f698be6ed7552ed4fdc52 (diff) | |
| parent | 5e64650d938d7a23b73532b4a68bc6bd08cfd041 (diff) | |
| download | git-749086fa090d81c10ebf16b1abfd138c3fa0232e.tar.gz git-749086fa090d81c10ebf16b1abfd138c3fa0232e.tar.xz | |
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
Diffstat (limited to 'gitweb')
| -rwxr-xr-x | gitweb/gitweb.perl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 4f051942b..2cb832753 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -405,7 +405,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); |