[Libreoffice] Error compiling bin/add_acor.py

[Sidney Markowitz]

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?

Thanks