]> git.ipfire.org Git - thirdparty/git.git/commitdiff
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)
"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


Trivial merge