Le 24/11/2010 23:03, Miklos Vajna a écrit :
On Wed, Nov 24, 2010 at 10:42:58PM +0100, Julien Nabet<serval2...@yahoo.fr>
wrote:
Now i do :
bin/g pull -r
and i got this :
===== components =====
usage: git merge-base [-a|--all]<commit> <commit>...
-a, --all outputs all common ancestors
usage: git merge-base [-a|--all]<commit> <commit>...
-a, --all outputs all common ancestors
...
You are not currently on a branch, so I cannot use any
It's not obvious for me, either. Maybe you did something else as well
what you forgot to mention. :) What is the output of git branch in
'rawbuild/components'? if it's not "* master", then use 'git checkout
master' to switch to master, then g pull -r should work.
Here what i've got :
ser...@serval:~/libreoffice-source/build/clone$ git branch
* master
ser...@serval:~/libreoffice-source/build/clone$ cd components/
ser...@serval:~/libreoffice-source/build/clone/components$ git branch
* (no branch)
master
ser...@serval:~/libreoffice-source/build/clone/components$ cd cui/
ser...@serval:~/libreoffice-source/build/clone/components/cui$ git branch
* (no branch)
master
ser...@serval:~/libreoffice-source/build/clone/components/cui$ cd source/
ser...@serval:~/libreoffice-source/build/clone/components/cui/source$
git branch
* (no branch)
master
ser...@serval:~/libreoffice-source/build/clone/components/cui/source$ cd
customize/
ser...@serval:~/libreoffice-source/build/clone/components/cui/source/customize$
git branch
* (no branch)
master
I call git branch on the different subdirectories because i don't know
if you can have "master" at the top level and <other branch> at another
level
Julien.
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
