DragonFly BSD source repository branch, master, updated. 7fc7e029e2b0bc155f8d694a0597ea3b2c27b761

[Sepherosa Ziehau]

On Sun, Nov 30, 2008 at 6:57 AM, Nicolas Thery <nthery at gmail.com> wrote:
> 2008/11/29 Simon 'corecode' Schubert <corecode at fs.ei.tum.de>:
>>> Is there a way not to push merge commits? (the first one above)
>>
>> What's wrong with merge commits?
>
> Well, it kinds of pollute the history of the public master branch.  People
> don't really need/want to know that I had to update my local repo to push
> my changes.
>
>> What you could have done now would have been to rebase your master onto
>> "corecode/master" (as you have called the dragonfly upstream repo
>> "corecode".
>>
>> Rebasing basically replays all your changesets onto a new position.  This
>> way you would not have produced a merge.
>
> Thanks.  I did some experiments and rebasing is what I'm was looking for.

I just found:
git pull --rebase
cold avoid "Merge" commit message.

Best Regards,
sephe

-- 
Live Free or Die