git config --local alias.pull-up 'pull up master --no-ff'