Merge branch 'hold/am'

diff --combined git-am.sh
index 39f255209e11283a0c3d402f215ff6c187922ea7,f143b7e782ce3b7cc7043c2d00e6cdcc10741bfe..343bee9d81e53106226f6f32a75860119ece92cb
--- 1/git-am.sh
--- 2/git-am.sh
+++ b/git-am.sh
@@@ -1,10 -1,14 +1,10 @@@
  #!/bin/sh
  #
  #
 -. git-sh-setup
  
 -usage () {
 -    echo >&2 "usage: $0 [--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way] <mbox>"
 -    echo >&2 "        or, when resuming"
 -    echo >&2 "        $0 [--skip | --resolved]"
 -    exit 1;
 -}
 +USAGE='[--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way] <mbox>
 +  or, when resuming [--skip | --resolved]'
 +. git-sh-setup
  
  stop_here () {
      echo "$1" >"$dotest/next"
@@@ -160,10 -164,7 +160,7 @@@ els
        # Start afresh.
        mkdir -p "$dotest" || exit
  
-       # cat does the right thing for us, including '-' to mean
-       # standard input.
-       cat "$@" |
-       git-mailsplit -d$prec "$dotest/" >"$dotest/last" || {
+       git-mailsplit -d"$prec" -o"$dotest" -b -- "$@" > "$dotest/last" ||  {
                rm -fr "$dotest"
                exit 1
        }