[sr-dev] git:master: Merge branch 'master' of ssh://oej at git.sip-router.org/ sip-router

[Andrei Pelinescu-Onciul]

On Oct 15, 2009 at 02:03, Olle E. Johansson <oej at edvina.net> wrote:
> Module: sip-router
> Branch: master
> Commit: 233fb5015484069f56f57f1a279c95288337d001
> URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=233fb5015484069f56f57f1a279c95288337d001
> 
> Author: oej <oej at edvina.net>
> Committer: oej <oej at 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.
See http://sip-router.org/wiki/git/commit-into-master
for more details.

This extra merge messages look confusing in the history.

Andrei