I didn't know about "git add -p" yet until someone told me that sourcetree has a feature to commit just the chunks from a file. #fb