Merge branch 'mm/rebase-continue-freebsd-WB'

Work around a bug in FreeBSD shell that caused a regression to "git
rebase" in v1.8.4.  May need to be later applied to 'maint'.

* mm/rebase-continue-freebsd-WB:
  rebase: fix run_specific_rebase's use of "return" on FreeBSD

diff --cc git-rebase.sh
index 8d7659a22c253b9f9535aee38e3bf0ce380cef75,7ab6434a4ff9e95d639bdf7914e50fb327abe8af..226752fbff62f4f27da95f7d711c898503fd7148
--- 1/git-rebase.sh
--- 2/git-rebase.sh
+++ b/git-rebase.sh
@@@ -147,27 -143,7 +147,27 @@@ move_to_original_branch () 
        esac
  }
  
- run_specific_rebase () {
 +finish_rebase () {
 +      if test -f "$state_dir/autostash"
 +      then
 +              stash_sha1=$(cat "$state_dir/autostash")
 +              if git stash apply $stash_sha1 2>&1 >/dev/null
 +              then
 +                      echo "$(gettext 'Applied autostash.')"
 +              else
 +                      git stash store -m "autostash" -q $stash_sha1 ||
 +                      die "$(eval_gettext "Cannot store \$stash_sha1")"
 +                      gettext 'Applying autostash resulted in conflicts.
 +Your changes are safe in the stash.
 +You can run "git stash pop" or "git stash drop" at any time.
 +'
 +              fi
 +      fi
 +      git gc --auto &&
 +      rm -rf "$state_dir"
 +}
 +
+ run_specific_rebase_internal () {
        if [ "$interactive_rebase" = implied ]; then
                GIT_EDITOR=:
                export GIT_EDITOR