| CVS Command | Git Command |
|---|---|
|
export CVSROOT="user@optout.csc.ncsu.edu:/home/cvs/cvs" export CVS_RSH ssh | git config --global user.name "FirstName LastName" git config --global user.email "unityid@ncsu.edu" |
| cvs checkout module | git clone arcb.csc.ncsu.edu:/home/git/git-repo/module |
| cvs add file | git add file |
| cvs commit file cvs commit |
git commit file git commit -a |
| cvs rm file | git rm file |
| mv file file2 cvs rm file cvs add file2 |
git mv file file2 |
| cvs diff -u | less | git diff |
| mv file file2 cvs update file #if conflict detected, then edit <<< ... === ... >>> areas, then: cvs commit file |
git pull file #if conflict detected, then: git mergetool #after manual merge, update file, then: git commit -i file git push file |
| cvs tag tag_name | git tag -a tag_name |
| cvs update -r tag_name/branch_name | git checkout tag_name/branch_name |
| cvs tag new_branch_root cvs tag -b -r new_branch_root new_branch |
git branch new_branch git checkout new_branch |
| cvs update -j branch_name cvs commit -m "merge changes from branch_name" |
git merge branch_name |