2011-10-23
git: fetch and merge, don’t pull
git