X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-rebase.sh;h=00ca7b99fef35e21d24af844e6dbaa92cab5834f;hb=50c94032844bb184cdeff7779be3b6a23e04d312;hp=38cbee7dced95556141cc7f635979032ad7f52c9;hpb=87d99c64dfa8880592104245896557aa530d4fd9;p=git.git diff --git a/git-rebase.sh b/git-rebase.sh index 38cbee7dc..00ca7b99f 100755 --- 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=' @@ -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 ;; *)