Hi Paolo,

* Paolo Bonzini wrote on Thu, Aug 21, 2008 at 11:32:16AM CEST:
>> I committed this patch as it is pretty obvious.
>
> And I committed a merge in the meanwhile.  Sorry; I'll prepare a patch  
> to git to disable merges on branches where you do not want them. :-)

This:

[branch "master"]
        rebase = true

in your git config, is quite helpful, in order to let 'pull' rebase by
default.

Cheers,
Ralf


Reply via email to