Merge branch 'dl/subtree-push-no-squash'
authorJunio C Hamano <gitster@pobox.com>
Fri, 22 May 2015 19:41:43 +0000 (12:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 22 May 2015 19:41:43 +0000 (12:41 -0700)
"git subtree" script (in contrib/) does not have --squash option
when pushing, but the documentation and help text pretended as if
it did.

* dl/subtree-push-no-squash:
contrib/subtree: there's no push --squash

Trivial merge