summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
authorLibravatar Clemens Buchacher <drizzd@aon.at>2012-01-07 12:42:46 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-01-08 15:08:03 -0800
commitf6a34cfbb4314105c4dadd88eb42da26aef44dfd (patch)
treea128c801eba2c9b7ba5e918c49d90b9b0af17fa2 /Documentation/merge-strategies.txt
parentgit-daemon: add tests (diff)
downloadtgif-f6a34cfbb4314105c4dadd88eb42da26aef44dfd.tar.xz
git-daemon: produce output when ready
If a client tries to connect after git-daemon starts, but before it opens a listening socket, the connection will fail. Output "[PID] Ready to rumble]" after opening the socket successfully in order to inform the user that the daemon is now ready to receive connections. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions