X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-am.sh;h=df09b42840b7675e135605f9108894ce93e6d477;hb=5c28a8b054cb69a37638b0261fc370422c8fab58;hp=9317b3893552fda9d3e4cbdbd0c66bf69bd633a9;hpb=90215bf3008f0986a5a8414d6ea1523148f74826;p=git.git

diff --git a/git-am.sh b/git-am.sh
index 9317b3893..df09b4284 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -5,7 +5,7 @@
 SUBDIRECTORY_OK=Yes
 OPTIONS_KEEPDASHDASH=
 OPTIONS_SPEC="\
-git am [options] [<mbox>|<Maildir>...]
+git am [options] [(<mbox>|<Maildir>)...]
 git am [options] (--resolved | --skip | --abort)
 --
 i,interactive   run interactively
@@ -137,7 +137,7 @@ It does not apply to blobs recorded in its index."
     export GITHEAD_$his_tree
     if test -n "$GIT_QUIET"
     then
-	    export GIT_MERGE_VERBOSITY=0
+	    GIT_MERGE_VERBOSITY=0 && export GIT_MERGE_VERBOSITY
     fi
     git-merge-recursive $orig_tree -- HEAD $his_tree || {
 	    git rerere $allow_rerere_autoupdate