git log --graph --decorate --oneline --all will show you the true state of your repository. Or use a visualization tool like GitKraken.
↧
Comment by Schwern on Pushing changes in Git: "Your branch and 'origin/master' have diverged"
↧