If I'm doing something really nasty and I want to contribute it, I'll go back to the mainster branch and diff it against my ugly branch then checkout -b a new one and git apply < ./patch then commit that.

Obviously you can rebase-i 37 `commit -m bleh-test24` commits, but when it gets too messy I find it easier to just diff-patch-commit.