+ * If you have a simple change to a commit message, or
+ something that you don't really need interactive control
+ over (such as methodically rm'ing a file), git
+ filter-branch is very superior.
+
+ * 'git rebase -p -i' can be used to rewrite history interactively.
+ Doing this will nuke any manual merge resolution you
+ may have done (which may be a lot), thus, I highly
+ recommend that you enable rerere (rerere.enabled = true)
+ so that Git can automatically merge things for you.
+ If the merge fails, you'll still have to reconstitute
+ things manually.
+
+ * You may want to consider using the Git sequencer, for
+ which you can find a patch on the interwebs (I've never
+ tried it before)