Gentoo Logo
Gentoo Spaceship




Note: Due to technical difficulties, the Archives are currently not up to date. GMANE provides an alternative service for most mailing lists.
c.f. bug 424647
List Archive: gentoo-scm
Navigation:
Lists: gentoo-scm: < Prev By Thread Next > < Prev By Date Next >
Headers:
To: Caleb Cushing <xenoterracide@...>
From: Donnie Berkholz <dberkholz@g.o>
Subject: Re: Converting a recent CVS copy - Item 3: pushing, availability
Date: Thu, 16 Apr 2009 18:39:52 -0700
On 05:03 Tue 14 Apr     , Caleb Cushing wrote:
> On Tue, Apr 14, 2009 at 4:57 AM, Robin H. Johnson <robbat2@g.o> wrote:
> > Anybody wanting to pull and getting a failure due to non-fast-forwarding needs
> > to force it:
> 
> don't pull, pull merges... rebase.

For those of you less familiar with git, this is relevant when you've 
made local commits that haven't been pushed yet. If you pull with no 
options, you get these dumb merge entries in the history, but if you do 
pull --rebase, it rebases your local commits onto HEAD without putting 
the merge into history.

-- 
Thanks,
Donnie

Donnie Berkholz
Developer, Gentoo Linux
Blog: http://dberkholz.wordpress.com
Attachment:
pgpTeqVVpIJxq.pgp (PGP signature)
Replies:
Re: Converting a recent CVS copy - Item 3: pushing, availability
-- Caleb Cushing
Re: Converting a recent CVS copy - Item 3: pushing, availability
-- Nirbheek Chauhan
References:
Converting a recent CVS copy - Item 3: pushing, availability
-- Robin H. Johnson
Re: Converting a recent CVS copy - Item 3: pushing, availability
-- Caleb Cushing
Navigation:
Lists: gentoo-scm: < Prev By Thread Next > < Prev By Date Next >
Previous by thread:
Re: Converting a recent CVS copy - Item 3: pushing, availability
Next by thread:
Re: Converting a recent CVS copy - Item 3: pushing, availability
Previous by date:
Re: 'overlays' are altenatives to full tree clone
Next by date:
Re: 'overlays' are altenatives to full tree clone


Updated Jun 17, 2009

Summary: Archive of the gentoo-scm mailing list.

Donate to support our development efforts.

Copyright 2001-2013 Gentoo Foundation, Inc. Questions, Comments? Contact us.