diff --git a/git-rebase--am.sh b/git-rebase--am.sh
index ab2be30abf4f87..ff98fe3a7328ea 100644
--- a/git-rebase--am.sh
+++ b/git-rebase--am.sh
@@ -51,9 +51,9 @@ then
 else
 	rm -f "$GIT_DIR/rebased-patches"
 
-	git format-patch $git_format_patch_opt -k --stdout --full-index \
-		--cherry-pick --right-only --src-prefix=a/ --dst-prefix=b/ \
-		--no-renames --no-cover-letter --progress \
+	git format-patch -k --stdout --full-index --cherry-pick --right-only \
+		--src-prefix=a/ --dst-prefix=b/ --no-renames --no-cover-letter \
+		$git_format_patch_opt \
 		"$revisions" ${restrict_revision+^$restrict_revision} \
 		>"$GIT_DIR/rebased-patches"
 	ret=$?
diff --git a/git-rebase.sh b/git-rebase.sh
index b72e319ac91b59..5a4516a99eadb9 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -309,7 +309,6 @@ do
 	--quiet)
 		GIT_QUIET=t
 		git_am_opt="$git_am_opt -q"
-		git_format_patch_opt="$git_format_patch_opt -q"
 		verbose=
 		diffstat=
 		;;
@@ -446,6 +445,11 @@ else
 	state_dir="$apply_dir"
 fi
 
+if test -t 2 && test -z "$GIT_QUIET"
+then
+	git_format_patch_opt="$git_format_patch_opt --progress"
+fi
+
 if test -z "$rebase_root"
 then
 	case "$#" in