Created
August 11, 2011 13:29
-
-
Save nebiros/1139649 to your computer and use it in GitHub Desktop.
My git svn workflow
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# clone svn repo, -s means standar svn repo (trunk, branches, tags) | |
$ git svn clone file:///tmp/test-svn -s | |
# branches list | |
$ git branch -a | |
$ git repack -d | |
# creates and jump to the new branch | |
$ git checkout -b new_branch | |
# add changes | |
$ git add <FILE> | |
# commit changes to the current branch | |
$ git commit -a | |
# jump to the master | |
$ git checkout master | |
# merge changes from our new branch, a rebase is needed to make | |
# the repo history linear, check this out: http://progit.org/book/ch3-6.html | |
$ git rebase new_branch | |
# update trunk from svn | |
$ git svn rebase | |
# commit changes to svn | |
$ git svn dcommit |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment