Merge branch 'km/avoid-non-function-return-in-rebase'
authorJunio C Hamano <gitster@pobox.com>
Mon, 21 Apr 2014 17:42:45 +0000 (10:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Apr 2014 17:42:46 +0000 (10:42 -0700)
Work around /bin/sh that does not like "return" at the top-level
of a file that is dot-sourced from inside a function definition.

* 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

No differences found