From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Sat, 14 Jan 2012 14:27:29 GMT
Subject: Re: Commit changes to remote repository
Message-ID: <vpqboq6fjfy.fsf@bauges.imag.fr>
In-Reply-To: <20120114113141.GG2850@centaur.lab.cmartin.tk>

Carlos Martín Nieto <cmn@elego.de> writes:

> You're trying to push to a non-bare repository and change the
> currently active branch, which can cause problems, so git isn't
> letting you. There's an explanation of bare and non-bare at
> http://bare-vs-nonbare.gitrecipes.de/ but the short and sweet is that
> you should init the repo you want to use as the central point with
> --bare and do modifications locally and then push there.

An alternative is to push to a temporary, non-checked-out branch.

I sometimes do

  laptop$ git push desktop HEAD:incomming

and then

  desktop$ git merge incomming

The push does not disturb the worktree on the desktop, and the merge is
done manually on the receiving machine.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/