Merge branch 'master' into next

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 025ef2d5f6b37d89dab1d602e1d8d1a80ab7f42e..d15747f1ed8f875a3c1bb7129e50bfbc8d2b033f 100755 (executable)
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -30,7 +30,7 @@ $LONG_USAGE"
 fi
 
 case "$1" in
-       --h|--he|--hel|--help)
+       -h|--h|--he|--hel|--help)
        echo "$LONG_USAGE"
        exit
 esac