kde-workspace/4.9 messed up

[Christoph Feck]

On Sunday 11 November 2012 12:00:05 Pino Toscano wrote:
> Hi,
> 
> somehow the master branch of kde-workspace has been merged in the
> KDE/4.9 branch, with obvious consequences.
> Can anyone please fix this mess?
> 
> Thanks,

Uh oh, I think I did "git reset origin/HEAD --hard" in the 4.9 branch, 
to get rid of an initial commit I made in that branch. So HEAD doesn't 
refer to the remote head in the current branch, but always to the head 
of master?

Christoph Feck (kdepepo)