Hello,
I'm a little lost with git again now.
Yesterday, i made first patches by using :
git commit -a
git format-patch HEAD~1
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
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
Le 24/11/2010 23:03, Miklos Vajna a écrit :
On Wed, Nov 24, 2010 at 10:42:58PM +0100, Julien Nabetserval2...@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
On 24/11/10 21:42, Julien Nabet wrote:
Hello,
I'm a little lost with git again now.
Yesterday, i made first patches by using :
git commit -a
git format-patch HEAD~1
Now i do :
bin/g pull -r
and i got this :
= components =
usage: git merge-base [-a|--all] commit commit...
Le 24/11/2010 23:14, Miklos Vajna a écrit :
On Wed, Nov 24, 2010 at 11:07:51PM +0100, Julien Nabetserval2...@yahoo.fr
wrote:
Here what i've got :
ser...@serval:~/libreoffice-source/build/clone$ git branch
* master
ser...@serval:~/libreoffice-source/build/clone$ cd components/
On Wed, Nov 24, 2010 at 11:17:57PM +0100, Julien Nabet serval2...@yahoo.fr
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