diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-03-27 10:59:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-27 10:59:27 -0700 |
| commit | 4e87565d2a3e315b7afc39e9e1fe98c5607a1b11 (patch) | |
| tree | 6f268f4c98d8c9a06536a5a2fbea5ee9a7df83fc /git-merge-one-file.sh | |
| parent | Merge branch 'km/t1400-modernization' (diff) | |
| parent | remote-curl: allow push options (diff) | |
| download | tgif-4e87565d2a3e315b7afc39e9e1fe98c5607a1b11.tar.xz | |
Merge branch 'sb/push-options-via-transport'
Recently we started passing the "--push-options" through the
external remote helper interface; now the "smart HTTP" remote
helper understands what to do with the passed information.
* sb/push-options-via-transport:
remote-curl: allow push options
send-pack: send push options correctly in stateless-rpc case
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions