Differences
This shows you the differences between two versions of the page.
|
Next revision
|
Previous revision
|
software:scm [2010/05/08 20:48]
cyril created |
software:scm [2013/09/19 16:40] (current)
|
| Common tasks: | Common tasks: |
| ^ Task ^ GIT ^ SVN ^ CVS ^ | ^ Task ^ GIT ^ SVN ^ CVS ^ |
| | //Get Repository// | ''git clone <url> [<rep-name>]'' | ''svn checkout <url> [<rep-name>]'' | ''export CVSROOT=<url>;''<html><br/></html>''mkdir <rep-name>; cd <rep-name>;''<html><br/></html>''cvs checkout .''<html><br/></html>or<html><br/></html>''cvs -d <repo> checkout [-d <dest-dir>] <sub-dir>''| | | //Get Repository// | ''git clone <url> [<rep-name>]'' | ''svn checkout <url> [<rep-name>]'' | ''cvs -d <rep-name> checkout [-d <dest-dir>] <sub-dir|.>''| |
| | //Update// | ''git pull'' | ''svn up'' | ''cvs update'' | | | //Update// | ''git pull'' | ''svn up'' | ''cvs update [-d]'' | |
| | //Commit// | ''git commit -a; git push'' | ''svn commit'' | ''cvs commit'' | | | //Commit// | ''git commit -a; git push'' | ''svn commit'' | ''cvs commit'' | |
| | //Add files// | ''git add <file>'' | ''svn add <file>'' | ''cvs add <file>'' | | | //Add files// | ''git add <file>'' | ''svn add <file>'' | ''cvs add <file>'' | |
| | //Status// | ''git status'' | ''svn status'' | ''cvs -q status | grep '^[?F]' | grep -v 'to-date' '' | | | //Status// | ''git status'' | ''svn status'' | ''cvs -q status | grep '^[?F]' | grep -v 'to-date' '' | |
| | //Revert file// | ''git checkout <file>'' | ''svn revert <file>'' | ''cvs update -C <file>'' | | | //Revert file// | ''git checkout <file>'' | ''svn revert <file>'' | ''cvs update -C <file>'' | |
| | | //Mark conflict solved// | ''git add <file>'' | ''svn resolved <file>'' | | |
| |
| Less common tasks: | Less common tasks: |
| | //Commit some files// | ''git add <files>; git commit; git push''<html><br/></html>''git commit -o <files>; git push'' | ''svn commit <files>'' | ''cvs commit <files>'' | | | //Commit some files// | ''git add <files>; git commit; git push''<html><br/></html>''git commit -o <files>; git push'' | ''svn commit <files>'' | ''cvs commit <files>'' | |
| | //Diff -w// | ''git diff -w'' | ''svn diff -x -w | less'' | ''cvs diff -w | less'' | | | //Diff -w// | ''git diff -w'' | ''svn diff -x -w | less'' | ''cvs diff -w | less'' | |
| | | //Remove file from index// | | ''svn rm --keep-local <file>'' | | |
| |
| |
