Merge branch 'maint'

diff --git a/git-rebase.sh b/git-rebase.sh
index 240032f32d995a10ad08af689758b6fb954436b9..7d3a5d0e718eebe6fb5d1fa3362f2a7087d6e691 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -280,7 +280,7 @@ git-reset --hard "$onto"
 # we just fast forwarded.
 if test "$mb" = "$branch"
 then
-       echo >&2 "Fast-forwarded $branch to $newbase."
+       echo >&2 "Fast-forwarded $branch_name to $onto_name."
        exit 0
 fi