and the diff between your branch and origin/master should be what you expect