often do a "git add -p" and commit different aspects works for me.