Merge branch 'pt/gitk'

[git.git] / git-rebase.sh

diff --git a/git-rebase.sh b/git-rebase.sh
index 6759702c573f51ac00bf1b5c8abccf252cb4ff1d..69c1374823084804662dbd6b6d510ec2ec3428e9 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -63,7 +63,7 @@ skip!              skip current patch and continue
 "
 . git-sh-setup
 set_reflog_action rebase
-require_work_tree
+require_work_tree_exists
 cd_to_toplevel
 
 LF='
@@ -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"