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
| Navigation: |
|
Lists:
gentoo-scm:
< Prev
By Thread
Next >
< Prev
By Date
Next >
|
| Headers: |
|
To:
|
Donnie Berkholz <dberkholz@g.o>
|
|
From:
|
Nirbheek Chauhan <nirbheek.chauhan@...>
|
|
Subject:
|
Re: Converting a recent CVS copy - Item 3: pushing, availability
|
|
Date:
|
Fri, 17 Apr 2009 10:57:57 +0530
|
|
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
|
|
