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)
commit6263f58f86895096c21a07ad8dced76f84bd4708
tree63c231cdc63fa8829bcb1257c00d5f27f1acb395
parent823ac2b6330859bd145e6424663a98d85d455bf9
parent6ccc71a9d02726d59c1de818febf85a836f4e418
Merge branch 'dl/subtree-push-no-squash'

"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