See https://github.com/wdjoyner/sympy/pull/1.  

This is a temporary fix, though. You'll need to fix your git if you want to make any further changes, or indeed just pull in these. What you need to do is 

- Make sure you have no uncommitted changes: `git reset --hard` (this will clear all your changes permanently, but assuming everything is in that patch file you won't lose anything).

- Make sure you are on your crypto branch: `git checkout crypto`

- Then, after you tell me what your commit message should be at https://github.com/wdjoyner/sympy/pull/1 and I fix it, you should merge that pull request by clicking the merge button on that page.

- Finally, you can pull in those changes: `git fetch github` `git merge github/crypto`.

If you need help, it's easier to help with git on IRC.