Merge branch 'km/avoid-non-function-return-in-rebase' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 8 May 2014 17:01:06 +0000 (10:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 8 May 2014 17:01:06 +0000 (10:01 -0700)
commite79fcfcd3f95b1a6b4df11b889c69a80864354b0
tree3edaf8c525e6ef917a844e39384c4df02d75888a
parente230cd861bc1c1cbb0743800d6ade853898a38db
parent8cd65967fe0084574fcee278a5f9ff3d14047c4f
Merge branch 'km/avoid-non-function-return-in-rebase' into maint

"git rebase" used a POSIX shell construct FreeBSD /bin/sh does not
work well with.

* km/avoid-non-function-return-in-rebase:
  Revert "rebase: fix run_specific_rebase's use of "return" on FreeBSD"
  rebase: avoid non-function use of "return" on FreeBSD