[SR-Dev] git:master: Merge branch 'master' of ssh://janakj at git.sip-router.org/ sip-router

[Jan Janak]

On 26-02 13:25, Andrei Pelinescu-Onciul wrote:
> On Feb 26, 2009 at 13:06, Jan Janak <jan at iptel.org> wrote:
> > I didn't really mean to commit the to merges into master, I merged a wrong
> > branch. This is a side-effect of having --no-ff on master branch and doing
> > work on the master branch :-).
> 
> Sometimes you have to use --ff :-)
> We can try a revert if you wish (re-writing master to the commit id
> before the merge and retry, IMHO a good exercise for things to come
> :-)). If somebody fetched in the meantime, he would have then to run git
> fetch -f.

  No, I don't think it is necessary, those two merge commit only add more
  noise to the history, but they don't harm.

     Jan.