1 |
On Fri, Apr 17, 2009 at 7:09 AM, Donnie Berkholz <dberkholz@g.o> wrote: |
2 |
> On 05:03 Tue 14 Apr , Caleb Cushing wrote: |
3 |
>> On Tue, Apr 14, 2009 at 4:57 AM, Robin H. Johnson <robbat2@g.o> wrote: |
4 |
>> > Anybody wanting to pull and getting a failure due to non-fast-forwarding needs |
5 |
>> > to force it: |
6 |
>> |
7 |
>> don't pull, pull merges... rebase. |
8 |
> |
9 |
> For those of you less familiar with git, this is relevant when you've |
10 |
> made local commits that haven't been pushed yet. If you pull with no |
11 |
> options, you get these dumb merge entries in the history, but if you do |
12 |
> pull --rebase, it rebases your local commits onto HEAD without putting |
13 |
> the merge into history. |
14 |
> |
15 |
|
16 |
Oh, thank you thank you thank you. These things in the GNOME overlay |
17 |
were *really* bugging me. |
18 |
|
19 |
|
20 |
-- |
21 |
~Nirbheek Chauhan |