Merge branch 'cp/add-u-pathspec' into maint

diff --git a/git-rebase.sh b/git-rebase.sh
index eddc02875f3802844a4c284aaedef48417f4580d..fb4fef7b1d6f7abb08fca562ecaad6e36f671768 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -85,10 +85,8 @@ continue_merge () {
                        printf "Already applied: %0${prec}d " $msgnum
                fi
        fi
-       if test -z "$GIT_QUIET"
-       then
-               git rev-list --pretty=oneline -1 "$cmt" | sed -e 's/^[^ ]* //'
-       fi
+       test -z "$GIT_QUIET" &&
+       GIT_PAGER='' git log --format=%s -1 "$cmt"
 
        prev_head=`git rev-parse HEAD^0`
        # save the resulting commit so we can read-tree on it later