Skip to content

Instantly share code, notes, and snippets.

@shadyvb

shadyvb/.gitconfig

Created October 1, 2014 12:12
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save shadyvb/1f84b2662796f42a32a6 to your computer and use it in GitHub Desktop.
Save shadyvb/1f84b2662796f42a32a6 to your computer and use it in GitHub Desktop.
Download ZIP
Git / SVN
Raw
.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 -
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment