My Various Git Projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4c8ad06 46e3581)
Merge branch 'js/daemon-test-race-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 7 May 2012 20:17:17 +0000 (13:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 7 May 2012 20:17:17 +0000 (13:17 -0700)
The test scaffolding for git-daemon was flaky.

By Johannes Sixt
* js/daemon-test-race-fix:
  t5570: fix forwarding of git-daemon messages via cat


Trivial merge
The core git plumbing