Merge branch 'em/newer-freebsd-shells-are-fine-with-returns'
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Jun 2016 16:56:52 +0000 (09:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Jun 2016 16:56:52 +0000 (09:56 -0700)
commit3ec9150a8cff7ec2531e853b00407f40ca3624ab
tree15984f7c43d087c108c3687abddd68ac4ffd60ad
parenta010d61e8819205b153afe00744f882e5761b424
parent9b35cadc2c7660745264041317f5982e1dde3f88
Merge branch 'em/newer-freebsd-shells-are-fine-with-returns'

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