diff options
| -rw-r--r-- | git-rebase--am.sh | 1 | ||||
| -rwxr-xr-x | git-rebase.sh | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/git-rebase--am.sh b/git-rebase--am.sh index 375239341..ff98fe3a7 100644 --- a/git-rebase--am.sh +++ b/git-rebase--am.sh @@ -53,6 +53,7 @@ else 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 2cf73b88e..06f5082dc 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -73,6 +73,7 @@ test "$(git config --bool rebase.stat)" = true && diffstat=t autostash="$(git config --bool rebase.autostash || echo false)" fork_point=auto git_am_opt= +git_format_patch_opt= rebase_root= force_rebase= allow_rerere_autoupdate= @@ -444,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 |