git suggests

Git suggests

Moving changed files to another branch for check-in

If you have not made the commit yet, just run git stash. This will save away all of your changes. Switch to the branch you want the changes on and run git stash pop. There are lots of uses for git stash. This is certainly one of the more useful reasons.

An example:

git stash
git checkout correct-branch
git stash pop

Migration from SVN to Git

Commands:

git svn clone --stdlayout --no-metadata -A users.txt http://svn.domain.com.au/svn/repository/favourite-project
cd favourite-project
git remote add gitlab [email protected]:dev-team/favourite-project.git
git push --set-upstream gitlab --all

Links:

https://www.atlassian.com/git/tutorials/migrating-convert/
https://gist.github.com/leftclickben/322b7a3042cbe97ed2af
http://doc.gitlab.com/ce/workflow/importing/migrating_from_svn.html

Git submodules

https://chrisjean.com/git-submodules-adding-using-removing-and-updating/
http://stackoverflow.com/questions/4377573/how-to-link-1-git-repository-to-some-other-repositories