Merge branch 'sv/checkout'

[git.git] / git-rebase.sh

diff --git a/git-rebase.sh b/git-rebase.sh
index 2dc2c4fe9b4d4a7ff10398938efbed28fa6f43f7..61770b5a2837b9d69ffb1db455f39ffdb3c8ea00 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -307,7 +307,8 @@ fi
 if test -n "$verbose"
 then
        echo "Changes from $mb to $onto:"
-       git-diff-tree --stat --summary "$mb" "$onto"
+       # We want color (if set), but no pager
+       GIT_PAGER='' git-diff --stat --summary "$mb" "$onto"
 fi
 
 # Rewind the head to "$onto"; this saves our current head in ORIG_HEAD.