This shows you the differences between two versions of the page.
coding:version_control:git-svn [2012/08/15 13:23] robm [Interacting with the local GIT archive] |
coding:version_control:git-svn [2013/08/20 22:52] |
||
---|---|---|---|
Line 1: | Line 1: | ||
- | ====== GIT-SVN Crib Sheet ====== | ||
- | [[wp> | ||
- | |||
- | ===== Interacting with the SVN central repository ===== | ||
- | ^ SVN ^ GIT ^ | ||
- | | svn up | git svn rebase | | ||
- | | svn commit | git svn dcommit | | ||
- | | svn log | git svn log | | ||
- | | svn blame | git svn blame | | ||
- | | svn info | git svn info | | ||
- | | svn checkout | git svn clone | | ||
- | | svn proplist | git svn proplist | | ||
- | | svn propget | git svn propget | | ||
- | |||
- | ===== Interacting with the local GIT archive ===== | ||
- | ^ SVN ^ GIT ^ Notes ^ | ||
- | | svn up | git rebase | Only applicable when merging to/from other local branches | | ||
- | | svn commit | git commit | | | ||
- | | svn log --limit={N} | git log -n{N} | | | ||
- | | svn blame | git blame | | | ||
- | | svn info | - | N/A for local GIT | | ||
- | | svn checkout | git clone | | | ||
- | | svn cat | git show < | ||
- | | svn status | git status | | | ||
- | ===== Interacting with a remote GIT archive ===== | ||
- | ^ SVN ^ GIT ^ Notes ^ | ||
- | | svn up | git pull {URL} | Must provide URL. Can create URL aliases, see " | ||
- | | svn commit | git commit && git push | Commits to the *local* branch, then publishes the commit to the remote (assuming you have permission to do so) | | ||
- | | svn log --limit={N} | git log remotes/ | ||
- | | svn blame | git blame | | | ||
- | | svn info | git remote show origin | Assuming '' | ||
- | | svn checkout | git clone | | | ||