Re: [Libreoffice] git howto question

2011-11-14 Thread Winfried Donkers
ubject: Re: [Libreoffice] git howto question Hi Winfried, On Mon, 2011-11-14 at 11:54 +0100, Winfried Donkers wrote: > How do I update my local sources to the current (latest) master with > git? Ah - it is a trick indeed :-) As Christina says - if you have commited you can 'gi

Re: [Libreoffice] git howto question

2011-11-14 Thread 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 re

Re: [Libreoffice] git howto question

2011-11-14 Thread Michael Meeks
Hi Winfried, On Mon, 2011-11-14 at 11:54 +0100, Winfried Donkers wrote: > How do I update my local sources to the current (latest) master with > git? Ah - it is a trick indeed :-) As Christina says - if you have commited you can 'git pull -r' which will re-base your commit on top of the l

Re: [Libreoffice] git howto question

2011-11-14 Thread Chr. Rossmanith
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 "message>" 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 wi

[Libreoffice] git howto question

2011-11-14 Thread 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