Merge branch 'js/rebase-typo-branch-squelch-usage'

* js/rebase-typo-branch-squelch-usage:
  rebase: do not print lots of usage hints after an obvious error message

diff --combined git-rebase.sh
index d7855ea1c6dae8d8cbe35ae39f9c65e7bc9d7b11,2075ccf787620dea66bd63aae798a61742d5f60c..4761f288906a53f0336161142ddcf7799a38c4b8
--- 1/git-rebase.sh
--- 2/git-rebase.sh
+++ b/git-rebase.sh
@@@ -153,9 -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
@@@ -334,7 -332,7 +334,7 @@@ abort
        read_basic_state
        case "$head_name" in
        refs/*)
 -              git symbolic-ref HEAD $head_name ||
 +              git symbolic-ref -m "rebase: aborting" HEAD $head_name ||
                die "Could not move back to $head_name"
                ;;
        esac
@@@ -441,8 -439,7 +441,7 @@@ case "$#" i
        then
                head_name="detached HEAD"
        else
-               echo >&2 "fatal: no such branch: $1"
-               usage
+               die "fatal: no such branch: $1"
        fi
        ;;
  *)