diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-08-27 20:42:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-27 20:42:38 -0700 |
| commit | 5e64650d938d7a23b73532b4a68bc6bd08cfd041 (patch) | |
| tree | 303f0b96211f347c2b47d04808ceb08ede54c493 /gitweb/gitweb.perl | |
| parent | 9e4a90ba19033d25dca1eea495b0a8c5f06efbc6 (diff) | |
| parent | 93197898041fcaf84d8ac84df764cca7bf86b226 (diff) | |
| download | git-5e64650d938d7a23b73532b4a68bc6bd08cfd041.tar.gz git-5e64650d938d7a23b73532b4a68bc6bd08cfd041.tar.xz | |
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
Diffstat (limited to 'gitweb/gitweb.perl')
| -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 3f99361ed..6f355d806 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -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); |