Merge branch 'maint'

diff --git a/git-am.sh b/git-am.sh
index cc8787b460e601889fd90c5dba2055e9eb85bc22..c5b0039d860d6820769488ed8f22272c9a25fdb7 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -5,9 +5,9 @@
 SUBDIRECTORY_OK=Yes
 OPTIONS_KEEPDASHDASH=
 OPTIONS_SPEC="\
-git-am [options] [<mbox>|<Maildir>...]
-git-am [options] --resolved
-git-am [options] --skip
+git am [options] [<mbox>|<Maildir>...]
+git am [options] --resolved
+git am [options] --skip
 --
 d,dotest=       (removed -- do not use)
 i,interactive   run interactively