title: Fixing git double-commit history
body: <p>I had to do run <code>git filter-branch</code> the other day. I followed the instructions <a href="https://help.github.com/articles/remove-sensitive-data" rel="noreferrer">on github</a>, but something went wrong. I <em>think</em> someone on the team didn't run rebase on a local branch, and instead merged the changes. Ever since, the commit log is filled with double-commits, e.g.:</p>
  
  <pre><code>commit b0c03ec925c0b97150594a99861d8f21fd3ab22d
  Author: XXX
  Date:   Wed Mar 19 17:01:52 2014 -0400
  
      Removed most clearfixs in templates
  
  commit f30c21d21b5ea715a99b0844793cb4b5f5df97a1
  Author: XXX
  Date:   Wed Mar 19 17:01:52 2014 -0400
  
      Removed most clearfixs in templates
  
  commit 2346be43d0e02d3987331f0a9eeb2f12cd698ede
  Author: XXX
  Date:   Wed Mar 19 16:40:26 2014 -0400
  
      new redirect logic
  
  commit 1383070b31bde1aaa9eda7c2a9bcb598dd72247b
  Merge: d1e2eb6 94e07fe
  Author: XXX
  Date:   Wed Mar 19 16:28:41 2014 -0400
  
      Merge branch 'develop' of github.com:xxx/xxx into develop
  
  commit 79ce7824688cf2a71efd9ff82e3c7a71d53af229
  Merge: 6079061 1ed3967
  Author: XXX
  Date:   Wed Mar 19 16:28:41 2014 -0400
  
      Merge branch 'develop' of github.com:xxx/xxx into develop
  
  commit d1e2eb645a4fe2a1b3986082d0409b4075a0dbc9
  Author: XXX
  Date:   Wed Mar 19 16:28:36 2014 -0400
  
      Fixed broken responsiveness for companies listing page and code refactoring.
  
  commit 6079061f6ef1f856f94d92bc0fdacf18854b8a89
  Author: XXX
  Date:   Wed Mar 19 16:28:36 2014 -0400
  
      Fixed broken responsiveness for companies listing page and code refactoring.
  </code></pre>
  
  <p>Weirdly enough, not all the commits are doubled-up, such as "new redirect logic" above. Is there anything I can do to fix this? It's relatively benign, but now our commit history looks like crap. This <a href="https://stackoverflow.com/questions/20370794/fix-commit-history-in-git">SO post</a> suggested just leaving it as-is, but I'd rather have a clean commit history for the sake of posterity.</p>