From: Sylvain Rabot <sylvain@abstraction.fr>
To: git@vger.kernel.org
Subject: Re: How to ignore changes on remote
Date: Tue, 23 Mar 2010 15:25:27 +0100 [thread overview]
Message-ID: <1269354326.14299.7.camel@kheops> (raw)
In-Reply-To: <26ae428a1003230713y12f0c74dh3b22c0d97565159b@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 851 bytes --]
On Tue, 2010-03-23 at 14:13 +0000, Howard Miller wrote:
> >
> > 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>
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 197 bytes --]
next prev parent reply other threads:[~2010-03-23 14:27 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-23 13:54 How to ignore changes on remote Howard Miller
2010-03-23 14:07 ` Sylvain Rabot
2010-03-23 14:13 ` Howard Miller
2010-03-23 14:21 ` Alexander Iljin
2010-03-23 14:22 ` Santi Béjar
2010-03-23 14:24 ` Howard Miller
2010-03-23 14:25 ` Sylvain Rabot [this message]
2010-03-23 16:05 ` Scott Chacon
2010-03-23 16:13 ` Howard Miller
2010-03-23 16:20 ` Johannes Sixt
2010-03-23 17:20 ` Johan Herland
2010-03-23 17:47 ` Jakub Narebski
2010-03-23 18:02 ` Johan Herland
2010-03-23 16:44 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1269354326.14299.7.camel@kheops \
--to=sylvain@abstraction.fr \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).