[Libreoffice] git howto question

[Simos Xenitellis]

Sometimes people forget the '-r' parameter in 'git pull -r' so it is
suggested to create an alias,

git config --global alias.up "pull --rebase"


(you run this command and the alias is added to your ~/.gitconfig
configuration file).
Then, you run

git up

whenever you want to updated your local repository with changes from the
main LibreOffice Git repository.

Without the '-r' or '--rebase' you may get into a situation when you create
a branch at the main LibreOffice Git repository, which in most cases is not
what you want. Hence, the '--rebase' parameter.

Is there a Wiki page somewhere at
http://wiki.documentfoundation.org/Development that would be recommended to
add in some basic Git commands? Point to an existing page or recommend a
URL to add new content inside.

Simos

On Mon, Nov 14, 2011 at 1:05 PM, Chr. Rossmanith <ChrRossmanith at gmx.de>wrote:

> **
> You need to "git pull -r" but if you have your translations already done
> you need to commit them prior to pulling: git commit -m "<your commit
> message>" <your modified file>
>
> Christina
>
> Am 14.11.2011 11:54, schrieb Winfried Donkers:
>
>  How do I update my local sources to the current (latest) master with git?
> ****
>
> I am not familiar with git, have used 'git clone' and 'git diff', but I
> don't want to do 'git clone' again, of course.****
>
> Is 'git checkout' the proper way (run from the directory where .git is)?**
> **
>
> ** **
>
> I have some more german-english translations for sc/source/ui/view, but I
> want to make sure that I use the latest source files before I commit my
> lines.****
>
> ** **
>
> Thanks a lot for your help.****
>
> ** **
>
> Winfried****
>
>
>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/libreoffice/attachments/20111114/e5bb57fa/attachment-0001.htm>