Merge branch 'jk/add-p-skip-conflicts' into maint

diff --git a/git-rebase.sh b/git-rebase.sh
index 00ca7b99fef35e21d24af844e6dbaa92cab5834f..69c1374823084804662dbd6b6d510ec2ec3428e9 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -380,7 +380,7 @@ then
                then
                        . git-parse-remote
                        error_on_missing_default_upstream "rebase" "rebase" \
-                               "against" "git rebase <upstream branch>"
+                               "against" "git rebase <branch>"
                fi
                ;;
        *)      upstream_name="$1"