ugh, merging branches in git and forgetting to leave out –no-ff the one time you actually want to squash the history … smh (at myself)

— Brian Sweeney (@briswe) January 14, 2016