summaryrefslogtreecommitdiff
path: root/gitweb
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-01-08 20:44:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-01-08 20:44:11 (GMT)
commitc5dc20638baf54c43092ee676e0692cba954b194 (patch)
tree0106e685bf996f8bd306e5d9d8c6a1cad63bb5dc /gitweb
parentfe47c9cb5f98e305a15db24b8a9f62151ae65d8d (diff)
parent4e2c4c0d4f0e44909a7e38caadbb79ef9534f3e2 (diff)
downloadgit-c5dc20638baf54c43092ee676e0692cba954b194.zip
git-c5dc20638baf54c43092ee676e0692cba954b194.tar.gz
git-c5dc20638baf54c43092ee676e0692cba954b194.tar.bz2
Merge branch 'do/gitweb-typofix-in-comments'
Typofix. * do/gitweb-typofix-in-comments: gitweb: fix a couple spelling errors in comments
Diffstat (limited to 'gitweb')
-rwxr-xr-xgitweb/gitweb.perl4
1 files changed, 2 insertions, 2 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 0f857d7..65a3a9e 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -741,7 +741,7 @@ sub evaluate_gitweb_config {
$GITWEB_CONFIG_SYSTEM = "" if ($GITWEB_CONFIG_SYSTEM eq $GITWEB_CONFIG_COMMON);
# Common system-wide settings for convenience.
- # Those settings can be ovverriden by GITWEB_CONFIG or GITWEB_CONFIG_SYSTEM.
+ # Those settings can be overridden by GITWEB_CONFIG or GITWEB_CONFIG_SYSTEM.
read_config_file($GITWEB_CONFIG_COMMON);
# Use first config file that exists. This means use the per-instance
@@ -5285,7 +5285,7 @@ sub format_ctx_rem_add_lines {
# + c
# + d
#
- # Otherwise the highlightling would be confusing.
+ # Otherwise the highlighting would be confusing.
if ($is_combined) {
for (my $i = 0; $i < @$add; $i++) {
my $prefix_rem = substr($rem->[$i], 0, $num_parents);