Wans-MacBook-Pro:web wanxint$ git pull origin cancan
From https://github.com/snowstorm/web
 * branch            cancan     -> FETCH_HEAD
Already up-to-date.
Wans-MacBook-Pro:web wanxint$ git rm app/views/polls/show.html.haml.orig
fatal: pathspec 'app/views/polls/show.html.haml.orig' did not match any files
Wans-MacBook-Pro:web wanxint$