X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-rebase.sh;h=4761f288906a53f0336161142ddcf7799a38c4b8;hb=ff94409da9bdc5cafc02ee154bf09060eef3158f;hp=57cbe49ea42cb58031b8f78daef4d318486cc1cc;hpb=ea69619cd1081359e73e597a76fcf6444f222f2d;p=git.git diff --git a/git-rebase.sh b/git-rebase.sh index 57cbe49ea..4761f2889 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -153,7 +153,9 @@ move_to_original_branch () { message="rebase finished: $head_name onto $onto" git update-ref -m "$message" \ $head_name $(git rev-parse HEAD) $orig_head && - git symbolic-ref HEAD $head_name || + git symbolic-ref \ + -m "rebase finished: returning to $head_name" \ + HEAD $head_name || die "Could not move back to $head_name" ;; esac @@ -439,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 ;; *)