Due to a mistake importing content from Subversion years ago, I have occasionally run a filter-branch on my repositories. If you have issues doing a pull, you can update your repository to match upstream using the following command. This process is deterministic, and will correctly update any new commits or branches you might have locally to match history.

$ git filter-branch --tag-name-filter cat --msg-filter 'sed -e "s/\\\\!/!/g"' --env-filter 'if [ "$GIT_AUTHOR_EMAIL" = "saurik@saurk.com" ]; then GIT_AUTHOR_EMAIL="saurik@saurik.com"; fi; if [ "$GIT_COMMITTER_EMAIL" = "saurik@saurk.com" ]; then GIT_COMMITTER_EMAIL="saurik@saurik.com"; fi' -- --all