Gentoo Archives: gentoo-scm

From: Donnie Berkholz <dberkholz@g.o>
To: Caleb Cushing <xenoterracide@×××××.com>
Cc: "Robin H. Johnson" <robbat2@g.o>, gentoo-scm@l.g.o
Subject: Re: [gentoo-scm] Converting a recent CVS copy - Item 3: pushing, availability
Date: Fri, 17 Apr 2009 01:39:53
Message-Id: 20090417013952.GB15629@comet
In Reply to: Re: [gentoo-scm] Converting a recent CVS copy - Item 3: pushing, availability by Caleb Cushing
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

Replies

Subject Author
Re: [gentoo-scm] Converting a recent CVS copy - Item 3: pushing, availability Caleb Cushing <xenoterracide@×××××.com>
Re: [gentoo-scm] Converting a recent CVS copy - Item 3: pushing, availability Nirbheek Chauhan <nirbheek.chauhan@×××××.com>