added the option ff-only to pull and added a git up alias see http://stackoverflow.com/questions/15316601/in-what-cases-could-git-pull-be-harmful