Mike shared a good recommendation for working together with git. Posting it here for not forgetting.
\ Create a new branch, and work inside of it:\
$ git checkout -b new_branch
Do some work, make a handful of commits\
$ git commit -am 'commit 1' $ git commit file.whatever -m 'commit 2'
I'm done with this feature now, back to master\
$ git checkout master
Merge in my branch's work--but squashing all commits from new_branch into one\
$ git merge new_branch --squash
Commit all that work as a single public commit\
$ git commit -am 'adding feature X, blah blah'