[Libreoffice] Git question again

[Miklos Vajna]

On Wed, Nov 24, 2010 at 11:17:57PM +0100, Julien Nabet <serval2412 at yahoo.fr> wrote:
> Now i have this :
> serval at serval:~/libreoffice-source/build/clone/components$ git branch
> * (no branch)
>    master
> serval at serval:~/libreoffice-source/build/clone/components$ git rebase 
> --abort
> HEAD is now at eb24b6e RTL patch
> serval at serval:~/libreoffice-source/build/clone/components$ git checkout 
> master
> Already on 'master'
> Your branch and 'origin/master' have diverged,
> and have 3 and 13 different commit(s) each, respectively.
> serval at serval:~/libreoffice-source/build/clone/components$

Sounds good, use bin/g pull -r now. If you need further help, consider
joining #libreoffice on IRC so that we don't spam all the people on this
list. :)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/libreoffice/attachments/20101124/9aaca1c3/attachment.pgp>