From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 22 May 2015 19:41:43 +0000 (-0700)
Subject: Merge branch 'dl/subtree-push-no-squash'
X-Git-Tag: v2.5.0-rc0~100
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6263f58f86895096c21a07ad8dced76f84bd4708

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
---

6263f58f86895096c21a07ad8dced76f84bd4708