projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1ad4b17 d5570f4)
Merge branch 'jk/daemon-msgs'
authorJunio C Hamano <gitster@pobox.com>
Fri, 21 Oct 2011 23:04:32 +0000 (16:04 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Oct 2011 23:04:32 +0000 (16:04 -0700)
* jk/daemon-msgs:
  daemon: give friendlier error messages to clients

Conflicts:
daemon.c

1  2 
daemon.c patch | diff1 | diff2 | blob | history

diff --cc daemon.c
Simple merge
Git—the stupid content tracker