[FeepingCreature]

git rebase -i -r for advanced mode: git will keep merge commits, allowing you to make surgical changes to any side of a merge.