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)
commitaf3a43c...111bc3136389a9f1285fbccb97f42205
tree93e01df...8878b64cd28f3c0e56348a5d1627c717copy hash to clipboard (tree)
parent89aef71...0eb5b5e06216c2efbba76cffe17679f7copy hash to clipboard (diff)
parent9b35cad...2c7660745264041317f5982e1dde3f88copy hash to clipboard (diff)
git-rebase--interactive.sh
git-rebase--merge.sh