On Wed, Nov 24, 2010 at 11:17:57PM +0100, Julien Nabet <[email protected]> 
wrote:
> Now i have this :
> ser...@serval:~/libreoffice-source/build/clone/components$ git branch
> * (no branch)
>    master
> ser...@serval:~/libreoffice-source/build/clone/components$ git rebase 
> --abort
> HEAD is now at eb24b6e RTL patch
> ser...@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.
> ser...@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. :)

Attachment: pgptnbbNlaDgL.pgp
Description: PGP signature

_______________________________________________
LibreOffice mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Reply via email to