title: recommendations for dealing with overlapping changes in git?
body: <p>I have made two lots of changes to some code in a git repo, but I would like to make separate commits for each change. The changes are <em>not</em> clashing, but they do overlap - that is, they make independent changes, which sometimes happen to be on the same lines. This means that <code>git add --patch</code> won't work.</p>
  
  <p>An example of this type of change might be adding spaces after all commas to conform to a coding standard, and namespacing functions by prefixing them with a string.</p>
  
  <p>Is there any smart git-related way of dealing with this kind of clash, or is the only option to start from scratch, and undo one of the changes?</p>