Re: How to ignore changes on remote

From: Sylvain Rabot <sylvain@abstraction.fr>
Date: Mar 23, 2010, 14:25 UTC
Message-ID: <1269354326.14299.7.camel@kheops>
In-Reply-To: <26ae428a1003230713y12f0c74dh3b22c0d97565159b@mail.gmail.com>

On Tue, 2010-03-23 at 14:13 +0000, Howard Miller wrote:

Show 9 quoted lines

> >
> > git push origin +local_branch:remote_branch
> >
> 
> Thanks!
> 
> Tell me more about that '+'. I've never heard of it before. Can't see
> anything in the docs (although I'm probably not looking in the right
> place)

http://kernel.org/pub/software/scm/git/docs/git-push.html

the '+' means that you want to bypass the security which does not allow non fast-forward pushes.

Note that you shouldn't do non fast-forward pushes to a repository which can be cloned by other people than you. Once published (accessible to anybody) you should do a merge and then push to origin even if you only take your local history in the merge to avoid user pulling from origin conflicts due to the non fast forward history.

Regards.

-- 
Sylvain Rabot <sylvain@abstraction.fr>