Installing: MacPorts users, sudo port install git-core +svn ** Branching, committing, and pushing one large change to SVN via GIT (Thanks Chris (errtheblog.com) for the tip) git svn rebase git checkout -b new_branch ... do your work / local commits ... git checkout master git svn rebase git checkout -b up git merge --squash new_branch git commit git svn dcommit git checkout master git svn rebase git branch -D new_branch up **NOTE: Versions of git-svn 1.5.3.4+ let you merge normally to your master branch Worklflow under 1.5.3.4+ version: git svn clone <svn_repo> git checkout -b <work_branch> ...hack...hack... git commit -a git checkout master git svn rebase git merge <work_branch> #NOTE: no need for --squash anymore git svn dcommit -e # -e will let you enter a commit message for SVN
cheat sheets.
$ cheat gitsvn( add new | see all )
- updated sheets

- cheat
- shoulda
- capistrano
- rpm
- string
- sqld4r
- cheat_el
- magit
- to_i
- bm
- rails_date_formats
- sequel
- dexagogo_form_validation
- git
- git_remote_branch
Advertisement