author | Junio C Hamano <junkio@cox.net> | |
Wed, 18 Apr 2007 05:17:46 +0000 (22:17 -0700) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Wed, 18 Apr 2007 05:17:46 +0000 (22:17 -0700) | ||
commit | abbf594763a14e9c00c61f688e45bed636f1eb52 | |
tree | a86d03460ea615d59109c269c9e8fe1fae1c89ca | tree | snapshot |
parent | 17bee1947ac407c0a27f3ef7da573eacb848520e | commit | diff |
parent | 047528680e783046b89bb6b220a7576d74c538d0 | commit | diff |
Merge branch 'fl/cvsserver'
* fl/cvsserver:
config.txt: Add gitcvs.db* variables
cvsserver: Document the GIT branches -> CVS modules mapping more prominently
cvsserver: Reword documentation on necessity of write access
cvsserver: Allow to "add" a removed file
cvsserver: Add asciidoc documentation for new database backend configuration
cvsserver: Corrections to the database backend configuration
cvsserver: Use DBI->table_info instead of DBI->tables
cvsserver: Abort if connect to database fails
cvsserver: Make the database backend configurable
cvsserver: Allow to override the configuration per access method
cvsserver: Handle three part keys in git config correctly
cvsserver: Introduce new state variable 'method'
Conflicts:
Documentation/config.txt
* fl/cvsserver:
config.txt: Add gitcvs.db* variables
cvsserver: Document the GIT branches -> CVS modules mapping more prominently
cvsserver: Reword documentation on necessity of write access
cvsserver: Allow to "add" a removed file
cvsserver: Add asciidoc documentation for new database backend configuration
cvsserver: Corrections to the database backend configuration
cvsserver: Use DBI->table_info instead of DBI->tables
cvsserver: Abort if connect to database fails
cvsserver: Make the database backend configurable
cvsserver: Allow to override the configuration per access method
cvsserver: Handle three part keys in git config correctly
cvsserver: Introduce new state variable 'method'
Conflicts:
Documentation/config.txt
Documentation/config.txt | diff1 | | diff2 | | blob | history |
Documentation/git-cvsserver.txt | diff1 | | diff2 | | blob | history |
git-cvsserver.perl | diff1 | | diff2 | | blob | history |