[Libreoffice] Error compiling bin/add_acor.py
timar74 at gmail.com
Mon Oct 4 15:01:18 PDT 2010
2010/10/4 Sidney Markowitz <sidney at sidney.com>:
> Andras Timar wrote, On 5/10/10 10:05 AM:
>> Please git pull -r
> What does the -r option do? I tried git help pull, and man git and man
> git-pull and googling for git man pages on other platforms and none of them
> said anything about a -r option.
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. The prevents an extra commit to merge your
branch with origin, and keeps the git history cleaner.
If you do not modify the files, then it does not matter.
More information about the LibreOffice