Andrew's git / gitweb.git / diff
?
Merge branch 'em/newer-freebsd-shells-are-fine-with-returns' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Jul 2016 20:06:41 +0000 (13:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Jul 2016 20:06:41 +0000 (13:06 -0700)
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

1  2 
git-rebase--interactive.sh patch | diff1 | diff2 | blob | history
git-rebase--merge.sh patch | diff1 | diff2 | blob | history
diff --cc git-rebase--interactive.sh
Simple merge
diff --cc git-rebase--merge.sh
Simple merge