Merge branch 'maint'

diff --git a/git-am.sh b/git-am.sh
index 876b973a4d8f2f9a11b977d4faef4c84f7a4a99b..4126f0e857bad273d6f44cabe34565de860bd119 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -9,7 +9,7 @@ git-am [options] --resolved
 git-am [options] --skip
 --
 d,dotest=       use <dir> and not .dotest
-i,interactive=  run interactively
+i,interactive   run interactively
 b,binary        pass --allo-binary-replacement to git-apply
 3,3way          allow fall back on 3way merging if needed
 s,signoff       add a Signed-off-by line to the commit message
@@ -131,7 +131,7 @@ do
                binary=t ;;
        -3|--3way)
                threeway=t ;;
-       -s--signoff)
+       -s|--signoff)
                sign=t ;;
        -u|--utf8)
                utf8=t ;; # this is now default