diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-07-01 19:41:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-07-01 19:41:00 -0700 |
| commit | a4103bac37d92a13fc47797c3d02becc7800e577 (patch) | |
| tree | 0d0143a202633e5f2b9a7b7034112ed47b7965b5 /merge-recursive.c | |
| parent | 59773c7e583b1dcf4b63c4ee222b79cef460456b (diff) | |
| parent | 2ff4d1ab9ef6660c88020ddaadc410157e130cdc (diff) | |
| download | git-a4103bac37d92a13fc47797c3d02becc7800e577.tar.gz | |
Merge branch 'js/daemon-log'
* js/daemon-log:
receive-pack: do not send error details to the client
upload-pack: squelch progress indicator if client cannot see it
daemon: send stderr of service programs to the syslog
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions