Merge branch 'dl/subtree-push-no-squash' into next
commit74d07cae020928e939872f216b47f13302089f27
authorJunio C Hamano <gitster@pobox.com>
Mon, 11 May 2015 21:52:10 +0000 (11 14:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 11 May 2015 21:52:10 +0000 (11 14:52 -0700)
tree86328c44dd62cc7a3ed946888567c50ea19b607c
parentaa7e5542c765b7f8380a0404af443d171f2b869f
parent6ccc71a9d02726d59c1de818febf85a836f4e418
Merge branch 'dl/subtree-push-no-squash' into next

"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