User Tools

Site Tools


coding:version_control:git-svn

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revision Previous revision
Next revision
Previous revision
coding:version_control:git-svn [2009/08/25 13:27]
robm
coding:version_control:git-svn [2013/08/20 22:52] (current)
Line 16: Line 16:
 ^ SVN ^ GIT ^ Notes ^ ^ SVN ^ GIT ^ Notes ^
 | svn up | git rebase | Only applicable when merging to/from other local branches | | svn up | git rebase | Only applicable when merging to/from other local branches |
-| svn commit | git commit | |+| svn commit | ''git add'', followed by ''git commit'' | |
 | svn log --limit={N} | git log -n{N} | | | svn log --limit={N} | git log -n{N} | |
 | svn blame | git blame | | | svn blame | git blame | |
 | svn info | - | N/A for local GIT | | svn info | - | N/A for local GIT |
 | svn checkout | git clone | | | svn checkout | git clone | |
 +| svn cat | git show <COMMIT>:path/to/file.ext | Use ''HEAD^'' as <COMMIT> for SVN's ''PREV''
 +| svn status | git status | |
 ===== Interacting with a remote GIT archive ===== ===== Interacting with a remote GIT archive =====
 ^ SVN ^ GIT ^ Notes ^ ^ SVN ^ GIT ^ Notes ^
 | svn up | git pull {URL} | Must provide URL. Can create URL aliases, see "REMOTES" in ''man git-pull'' | | svn up | git pull {URL} | Must provide URL. Can create URL aliases, see "REMOTES" in ''man git-pull'' |
-| svn commit | git commit | |+| 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/origin | Where ''origin'' is the original branch. Use ''git branch -r'' to see a list of remote branches | | svn log --limit={N} | git log remotes/origin | Where ''origin'' is the original branch. Use ''git branch -r'' to see a list of remote branches |
 | svn blame | git blame | | | svn blame | git blame | |
coding/version_control/git-svn.1251206827.txt.gz · Last modified: 2009/08/25 13:27 by robm