git pull with fast-forward (--ff-only) is the only sane way to use git pull (if one must use git pull). The most powerful one most people don’t use is reset. S

git pull with fast-forward (--ff-only) is the only sane way to use git pull (if one must use git pull). The most powerful one most people don’t use is reset. Soft and hard resets are my bread and butter. I don’t even bother with interactive rebases for squashing. I do a soft reset against origin/<branch> and create a new commit.