[thisdougb]

I just use a branch per feature or unit of work. The git hooks make the time measurement automatic.

  git checkout -b feature_a
  <do work>
  git checkout master
  git merge feature_a

probably about 10 seconds of effort, over the course of 1-3 days of coding time.