I ended up doing the following sequence:
git add .gitignore
git commit -m "temp
git stash
git checkout initial_branch_i_was_on
git fetch
git rebase origin/develop
git stash pop
And then manually resolving the handful or rebase issues. Everything said and done it was painless enough. Whether or not there is a better way I don't know.