Not sure how you managed to get these changes into your diff, easiest is probably redoing the changes in a clean branch:


```bash
git remote add upstream git://github.com/diaspora/diaspora.git
git fetch upstream
git branch -m 4304-add-ignore-user-icon 4304-add-ignore-user-icon_bak
git branch -m develop develop_bak
git checkout -b develop upstream/develop
git checkout -b 4304-add-ignore-user-icon
# Now apply your changes again
git commit -am "some descriptive message"
git push -uf origin develop 4304-add-ignore-user-icon
```