Kickflip your git branch!
git-kickflip creates a bunch of dummy branches only differing in a .git-kickflip file, splits and merges them in crazy ways, then remerges them into the single final branch. To use simply type git kickflip when in a commit belonging to a branch.