Merge branch 'ow/config-mailmap-pathname' into maint

diff --git a/contrib/examples/git-commit.sh b/contrib/examples/git-commit.sh
index e80155c2687d6f785b2c05c87304037494bf0e19..5cafe2eb7715123ba0d748be308f35731ea89ddb 100755 (executable)
--- a/contrib/examples/git-commit.sh
+++ b/contrib/examples/git-commit.sh
@@ -280,7 +280,7 @@ case "$#,$also,$only,$amend" in
 0,,,*)
        ;;
 *,,,*)
-       only_include_assumed="# Explicit paths specified without -i nor -o; assuming --only paths..."
+       only_include_assumed="# Explicit paths specified without -i or -o; assuming --only paths..."
        also=
        ;;
 esac