[Libreoffice] Error compiling bin/add_acor.py

[Norbert Thiebaud]

On Mon, Oct 4, 2010 at 5:41 PM, Sidney Markowitz <sidney at sidney.com> wrote:
> Andras Timar wrote, On 5/10/10 11:01 AM:
>> The switch -r first applies the changes that were made on origin
>> (since your branch was checked out), then applies your changes on top
>> of the current origin.
>
> How is this behaviour different from git pull without the -r ?
>
> Where is the -r option documented for git pull?

This is git pull --rebase

>
> Thanks
> _______________________________________________
> LibreOffice mailing list
> LibreOffice at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
>