git-am: error out when seeing -b/--binary

[git.git] / git-rebase.sh

diff --git a/git-rebase.sh b/git-rebase.sh
index 38cbee7dced95556141cc7f635979032ad7f52c9..69c1374823084804662dbd6b6d510ec2ec3428e9 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -22,7 +22,7 @@ currently checked out branch is used.
 
 Example:       git-rebase master~1 topic
 
-        A---B---C topic                   A'\''--B'\''--C'\'' topic
+       A---B---C topic                   A'\''--B'\''--C'\'' topic
        /                   -->           /
   D---E---F---G master          D---E---F---G master
 '
@@ -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"
@@ -441,8 +441,7 @@ case "$#" in
        then
                head_name="detached HEAD"
        else
-               echo >&2 "fatal: no such branch: $1"
-               usage
+               die "fatal: no such branch: $1"
        fi
        ;;
 *)