Merge branch 'jc/maint-am-keep'

git-am.sh

@@ -577,11 +577,12 @@ do
 			git cat-file commit "$commit" |
 			sed -e '1,/^$/d' >"$dotest/msg-clean"
 		else
-			SUBJECT="$(sed -n '/^Subject/ s/Subject: //p' "$dotest/info")"
+			{
-			case "$keep_subject" in -k)  SUBJECT="[PATCH] $SUBJECT" ;; esac
+				sed -n '/^Subject/ s/Subject: //p' "$dotest/info"
-
+				echo
-			(printf '%s\n\n' "$SUBJECT"; cat "$dotest/msg") |
+				cat "$dotest/msg"
-				git stripspace > "$dotest/msg-clean"
+			} |
+			git stripspace > "$dotest/msg-clean"
 		fi
 		;;
 	esac