summaryrefslogtreecommitdiff
path: root/gitweb/gitweb.perl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-08-28 05:01:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-08-28 05:01:01 (GMT)
commitaab9ea1aad2447522928d7e9af0bb030558012cb (patch)
tree4bc083ee1927d43398a3d51c58f9c030ce15a06f /gitweb/gitweb.perl
parent106a36509dc78e32e0b0e64c8da12ace639c879a (diff)
parent749086fa090d81c10ebf16b1abfd138c3fa0232e (diff)
downloadgit-aab9ea1aad2447522928d7e9af0bb030558012cb.zip
git-aab9ea1aad2447522928d7e9af0bb030558012cb.tar.gz
git-aab9ea1aad2447522928d7e9af0bb030558012cb.tar.bz2
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
Diffstat (limited to 'gitweb/gitweb.perl')
-rwxr-xr-xgitweb/gitweb.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index d02b7a3..ff2d42a 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -415,7 +415,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);