tree e02286103ffb723631f6420a00188c18a7845e6e
parent 860bbd50390956b121f320987c5140b337e1ea3a
parent c1bc30614ad0a9b63f4f798f0aa71d376a095938
author Junio C Hamano <gitster@pobox.com> 1207120935 -0700
committer Junio C Hamano <gitster@pobox.com> 1207120935 -0700

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