From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 2 Apr 2008 07:22:15 +0000 (-0700)
Subject: Merge branch 'dd/cvsserver'
X-Git-Tag: v1.5.5-rc3~6
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=22e885e6d89a5aadd9ed2f7f36f5ae83cc77de74;p=git.git

Merge branch 'dd/cvsserver'

* dd/cvsserver:
  cvsserver: Use the user part of the email in log and annotate results
  cvsserver: Add test for update -p
  cvsserver: Implement update -p (print to stdout)
  cvsserver: Add a few tests for 'status' command
  cvsserver: Do not include status output for subdirectories if -l is passed
  cvsserver: Only print the file part of the filename in status header
  cvsserver: Respond to the 'editors' and 'watchers' commands
---

22e885e6d89a5aadd9ed2f7f36f5ae83cc77de74