Do not use `git pull`
H/T: http://stackoverflow.com/a/15316602
Instead of git pull, use the git up alias:
git config --global alias.up '!git remote update -p; git merge --ff-only @{u}'
Written by Justin Downing
Related protips
Have a fresh tip? Share with Coderwall community!
Post
Post a tip
Best
#Git
Authors
Related Tags
#git
Sponsored by #native_company# — Learn More
#native_title#
#native_desc#