simple git branching and merging

git checkout -b branchname

creates a new branch in which I can make changes related to a feature I'm working on.

When I'm done testing this part of the work, I can

git checkout master
git merge branchname

to, well, merge the two branches. Lather, rinse, repeat. This workflow adds a little grouping to my repository when I work on one feature at a time.