So I forked a project, and made a few changes and pushed those to origin/master. I didn't intend to send these changes back to upstream. All was fine and good until now, but now I have some changes I do want to push upstream.
Can I rebase back to upstream in a different branch, and commit to that branch? Can I commit these changes from my branch? Have I horribly mangled my repo?