projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b43b8a2 b8843ef)
Merge branch 'ms/daemon-timeout-is-in-seconds'
authorJunio C Hamano <gitster@pobox.com>
Fri, 2 Sep 2011 20:17:58 +0000 (13:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 2 Sep 2011 20:17:58 +0000 (13:17 -0700)
* ms/daemon-timeout-is-in-seconds:
  git-daemon.txt: specify --timeout in seconds


Trivial merge
Git—the stupid content tracker