[Olsr-dev] Repository conversion finished

[Henning Rogge]

On Wed, Aug 15, 2012 at 8:22 PM, John Hay <(spam-protected)> wrote:
>> > If you forbid this, how do you do the next one (2.) "fix stuff"? Surely
>> > you fix it first in the master branch? So then the fix is already under
>> > version control and your tool (git) will make less mistakes than humans.
>> > :-)
>>
>> We will cherry-pick them to the release-branch.
>>
>> > In FreeBSD for instance, you are not supposed to commit directly on a
>> > branch. You commit to head (master) and after some settling time and
>> > if it is deemed necessary, it may be merged.
>>
>> The problem is that a merge always contains ALL commits of the branch
>> that is merged. But we don't want new features, we only want the
>> fixes.
>
> Is that a git limitation? If so, I can understand the reasoning. On
> others you can merge just specific commits.

Its more a different semantics.

"merging" is joining two development histories together... you get
everything of both.
"cherry picking" is about get one commit of a branch and commit it to
a second one.

Henning
-- 
Steven Hawkings about cosmic inflation: "An increase of billions of
billions of percent in a tiny fraction of a second. Of course, that
was before the present government."