Gregor Zattler <telegr...@gmx.net> writes: > s$ git branch -a --contains HEAD > * emacs-24 > master > remotes/origin/HEAD -> origin/master > remotes/origin/master > remotes/origin/trunk
So indeed your local emacs-24 branch points in fact to a commit from trunk. I think running those commands should fix the problem: git branch -u origin/emacs-24 git reset --hard origin/emacs-24 -- Nico.
