diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-05-22 12:41:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-22 12:41:43 -0700 |
| commit | 6263f58f86895096c21a07ad8dced76f84bd4708 (patch) | |
| tree | 63c231cdc63fa8829bcb1257c00d5f27f1acb395 /merge-recursive.c | |
| parent | Merge branch 'sg/completion-omit-credential-helpers' (diff) | |
| parent | contrib/subtree: there's no push --squash (diff) | |
| download | tgif-6263f58f86895096c21a07ad8dced76f84bd4708.tar.xz | |
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
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions