gistfile1.txt

Jeremy, this is for your benefit. I wanted to follow Josh's advice with that patch that Peter just sent in.

Here was my workflow:

- git pull (make sure I'm up to date)
- git checkout -b monospark  (make a branch to work in)
- *copy the patch file into my working dir*
- git apply patch.txt
- del patch.txt
- rake
- *open browser, make sure everything is kosher*
- git commit -a -m "blah blah"
- git checkout master  (switch back to master)
- git pull   (make sure I'm still up to date)
- git checkout monospark 
- git rebase origin  (rebase my branch against master to avoid a full merge)
- git checkout master  
- git merge monospark  (merge my branch back into master -- fast-forward quicklike)
- git push  (fin)

gistfile2.txt

In SVN:

- svn update
- copy the patch
- svn apply.. (or something, I forget the syntax)
- del patch
- rake
- (smoke test)
- svn update (do merge)
- svn commit... 

Done.