GIT 1.5.4.7

diff --git a/git-am.sh b/git-am.sh
index 6be33d9ddbb27c5085d677855ad6c6c555b82805..4dce87bdff7763cdd6e9d73ed236e40a5b3ca34c 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -10,7 +10,7 @@ git-am [options] --skip
 --
 d,dotest=       use <dir> and not .dotest
 i,interactive   run interactively
-b,binary        pass --allo-binary-replacement to git-apply
+b,binary        pass --allow-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
 u,utf8          recode into utf8 (default)
@@ -302,7 +302,7 @@ do
                SUBJECT="$(sed -n '/^Subject/ s/Subject: //p' "$dotest/info")"
                case "$keep_subject" in -k)  SUBJECT="[PATCH] $SUBJECT" ;; esac
 
-               (echo "$SUBJECT" ; echo ; cat "$dotest/msg") |
+               (printf '%s\n\n' "$SUBJECT"; cat "$dotest/msg") |
                        git stripspace > "$dotest/msg-clean"
                ;;
        esac