Except for the times I just want to have what's in upstream by resetting to that commit instead of merging or rebasing.