Git / SVN

.gitconfig

# switch to vip git branch
git checkout vip
# pull updates
svn up
# reset working tree
svn revert --recursive .
# try to merge the previous branch ( ie: GNDEV-88 ), but do not auto commit
git merge - --no-commit --no-ff
# see the svn diff, before committing
svn diff | more
# commit to svn
svn ci -m 'some message, probably contains branch name'
# commit to git branch
git add .
git commit -m 'SVN Rev. xxxx'
# push to github
git push
# return to previous branch
git checkout -