来自http://yehudakatz.com/2010/05/13/common-git-workflows/
Comparison
Here’s a workflow comparison between git and subversion:
Operation | git | svn |
---|---|---|
Clone a repository | git clone git://github.com/rails/rails.git | svn checkout http://dev.rubyonrails.org/svn/rails/trunk |
Preparing changes | git commit (using gitx) | nothing or create a manual diff |
Update from the remote | git pull --rebase | svn up |
Resolving conflicts | git add then git rebase --continue | svn resolve |
Resolving conflicts without –rebase | git add then git commit | N/A |
Yikes! Rolling back | git reset –hard | svn up -rOLD then apply diff (only if you manually made a diff first) |
Pushing | git push | svn commit |