diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-03-13 22:56:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-13 22:56:01 -0700 |
| commit | 1469d9906833a8bd7d07a70ba8250c823716f20a (patch) | |
| tree | 71a433860f828d8707e44739a059062b76a2af50 /builtin/merge-tree.c | |
| parent | Merge branch 'jk/daemon-interpolate' into maint (diff) | |
| parent | daemon: use callback to build interpolated path (diff) | |
| download | tgif-1469d9906833a8bd7d07a70ba8250c823716f20a.tar.xz | |
Merge branch 'rs/daemon-interpolate' into maint
"git daemon" looked up the hostname even when "%CH" and "%IP"
interpolations are not requested, which was unnecessary.
* rs/daemon-interpolate:
daemon: use callback to build interpolated path
daemon: look up client-supplied hostname lazily
Diffstat (limited to 'builtin/merge-tree.c')
0 files changed, 0 insertions, 0 deletions