Is there an easy way to prevent merge commits that only exist because i forgot to pull?

Tue, Sep 4, 2018

git pull rebase if easy but go back to merging if not git pull fast-forward if possible git don’t create a merge commit if i just forgot to pull before committing

I blank out the commit message and do a git reset --hard HEAD and then git pull --rebase and then push; but i wonder if there’s basically a way to automate that behavior. That is, when we know for certain the merge commit isn’t going to add any value, just skip it.

Always rebasing - http://kernowsoul.com/blog/2012/06/20/4-ways-to-avoid-merge-commits-in-git/ - is not what i want, i don’t think.