Git and SVN Notes

Thu, 27 Aug 2009 12:27:13 -0400

More for my own reference than anything else…

I have an SVN repository cloned locally. I’ve made a couple of changes in order for my application to run locally and I commited those all against the “dev” branch I set up.

I then go off and do some actual work, which then needs to get sent back upstream to SVN. This is my workflow.

Starting in the dev branch, with all of my changes committed…

Because I should be making sure I have the newest stuff from SVN, just in case
bash
```
git svn rebase
```
Switch over to the master, which should mimic SVN
bash
```
git checkout master
```
Bring master up to date with the dev branch
bash
```
git rebase dev
```
Remove the commits I don’t want to push back to SVN
bash
```
git rebase -i git-svn
```
Because I’m paranoid and want to make sure only the commits I want are actually coming through
bash
```
git svn dcommit --dry-run
```
Commit it off to SVN
bash
```
git svn dcommit
```

Changing History

Revise the last 37 commits. Opens up a log in $EDITOR where you can “squash” commits together

bash

git rebase -i HEAD~37

–

Undoing crazy rebases

Find the commit you want to bring back, copy its sha1 starter
bash
```
git reflog
```
Boom, commit is back
bash
```
git cherry-pick <sha1 starter />
```

Articles

Git and SVN Notes

Changing History

Undoing crazy rebases