17 Oct
2009
17 Oct
'09
6:08 p.m.
15 okt 2009 kl. 09.17 skrev Andrei Pelinescu-Onciul:
On Oct 15, 2009 at 02:03, Olle E. Johansson
<oej(a)edvina.net> wrote:
git pull -rebase origin master fails...
git pull --rebase origin master
docbook/catalog.xml: needs update
docbook/entities.xml: needs update
modules/ctl/README: needs update
modules/ctl/doc/ctl.xml: needs update
modules/ctl/doc/params.xml: needs update
modules/ctl/doc/rpc.xml: needs update
modules/tm/README: needs update
refusing to pull with rebase: your working tree is not up-to-date
Sorry for all this mess, I'm still a newbie at git and docbook...
Feels very embarrassing, but hopefully my adventures will help to get
documentation trimmed ;-)
/O
Module: sip-router
Branch: master
Commit: 233fb5015484069f56f57f1a279c95288337d001
URL:
http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=233fb50…
Author: oej <oej(a)edvina.net>
Committer: oej <oej(a)edvina.net>
Date: Thu Oct 15 02:02:50 2009 +0200
Merge branch 'master' of ssh://oej@git.sip-router.org/sip-router
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Please try using always git pull --rebase origin master instead of
git pull origin master.