Merge branch 'gc/branch-recurse-submodules-fix'

[thirdparty/git.git] / contrib / rerere-train.sh

diff --git a/contrib/rerere-train.sh b/contrib/rerere-train.sh
index 75125d6ae003fcd213a32a0f893ae0ae48b48a1a..26b724c8c6d9f273f112e10d1c7c58024403fea4 100755 (executable)
--- a/contrib/rerere-train.sh
+++ b/contrib/rerere-train.sh
@@ -86,7 +86,7 @@ do
        fi
        if test -s "$GIT_DIR/MERGE_RR"
        then
-               git show -s --pretty=format:"Learning from %h %s" "$commit"
+               git --no-pager show -s --format="Learning from %h %s" "$commit"
                git rerere
                git checkout -q $commit -- .
                git rerere