Gentoo Archives: gentoo-scm

From: Nirbheek Chauhan <nirbheek.chauhan@×××××.com>
To: Donnie Berkholz <dberkholz@g.o>
Cc: Caleb Cushing <xenoterracide@×××××.com>, "Robin H. Johnson" <robbat2@g.o>, gentoo-scm@l.g.o, gnome@g.o
Subject: Re: [gentoo-scm] Converting a recent CVS copy - Item 3: pushing, availability
Date: Fri, 17 Apr 2009 05:28:00
Message-Id: 8b4c83ad0904162227q4912b1f2w8da6876fc3d912ed@mail.gmail.com
In Reply to: Re: [gentoo-scm] Converting a recent CVS copy - Item 3: pushing, availability by Donnie Berkholz
On Fri, Apr 17, 2009 at 7:09 AM, Donnie Berkholz <dberkholz@g.o> wrote:
> 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. >
Oh, thank you thank you thank you. These things in the GNOME overlay were *really* bugging me. -- ~Nirbheek Chauhan