Fix overridable written with an extra 'e'

Nanako Shiraishi · gitster · commit 93197898041f · 2009-08-27T20:41:48.000-07:00
Signed-off-by: Nanako Shiraishi &lt;nanako3@lavabit.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/Documentation/git-gc.txt b/Documentation/git-gc.txt
@@ -61,7 +61,7 @@ automatic consolidation of packs.
 
 --prune=<date>::
 	Prune loose objects older than date (default is 2 weeks ago,
-	overrideable by the config variable `gc.pruneExpire`).  This
+	overridable by the config variable `gc.pruneExpire`).  This
 	option is on by default.
 
 --no-prune::
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -376,7 +376,7 @@ sub gitweb_get_feature {`
`376`	`376`	`@{$feature{$name}{'default'}});`
`377`	`377`	`if (!$override) { return @defaults; }`
`378`	`378`	`if (!defined $sub) {`
`379`		`- warn "feature $name is not overrideable";`
	`379`	`+ warn "feature $name is not overridable";`
`380`	`380`	`return @defaults;`
`381`	`381`	`}`
`382`	`382`	`return $sub->(@defaults);`