Merge branch 'em/newer-freebsd-shells-are-fine-with-returns' into maint
commitaf3a43cb111bc3136389a9f1285fbccb97f42205
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Jul 2016 20:06:41 +0000 (6 13:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Jul 2016 20:06:41 +0000 (6 13:06 -0700)
tree93e01dfc8878b64cd28f3c0e56348a5d1627c717
parent89aef71d0eb5b5e06216c2efbba76cffe17679f7
parent9b35cadc2c7660745264041317f5982e1dde3f88
Merge branch 'em/newer-freebsd-shells-are-fine-with-returns' into maint

Comments about misbehaving FreeBSD shells have been clarified with
the version number (9.x and before are broken, newer ones are OK).

* em/newer-freebsd-shells-are-fine-with-returns:
  rebase: update comment about FreeBSD /bin/sh
git-rebase--interactive.sh
git-rebase--merge.sh