Sometimes people forget the '-r' parameter in 'git pull -r' so it is suggested to create an alias,<br><br><pre>git config --global alias.up "pull --rebase"</pre><br>(you run this command and the alias is added to your ~/.gitconfig configuration file).<br>
Then, you run<br><br>git up<br><br>whenever you want to updated your local repository with changes from the main LibreOffice Git repository.<br><br>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.<br>
<br>Is there a Wiki page somewhere at <a href="http://wiki.documentfoundation.org/Development">http://wiki.documentfoundation.org/Development</a> 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.<br>
<br>Simos<br><br><div class="gmail_quote">On Mon, Nov 14, 2011 at 1:05 PM, Chr. Rossmanith <span dir="ltr"><<a href="mailto:ChrRossmanith@gmx.de">ChrRossmanith@gmx.de</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
<u></u>
<div text="#000000" bgcolor="#ffffff">
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><br>
<br>
Christina<br>
<br>
Am 14.11.2011 11:54, schrieb Winfried Donkers:
<blockquote type="cite"><div><div class="h5">
<div>
<p class="MsoNormal">How do I update my local sources to the
current (latest)
master with git?<u></u><u></u></p>
<p class="MsoNormal">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.<u></u><u></u></p>
<p class="MsoNormal">Is 'git checkout' the proper way (run from
the directory
where .git is)?<u></u><u></u></p>
<p class="MsoNormal"><u></u> <u></u></p>
<p class="MsoNormal">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.<u></u><u></u></p>
<p class="MsoNormal"><u></u> <u></u></p>
<p class="MsoNormal">Thanks a lot for your help.<u></u><u></u></p>
<p class="MsoNormal"><u></u> <u></u></p>
<p class="MsoNormal"><span style="font-size:10pt">Winfried</span><u></u><u></u></p>
<p class="MsoNormal"> </p><p class="MsoNormal"><br></p></div></div></div></blockquote></div></blockquote></div><br>