From: Enrico Weigelt <weigelt@metux.de>
Date: Fri, 24 Sep 2010 20:18:39 GMT
Subject: Re: Re: Really beginner on Version Control
Message-ID: <20100924201839.GB29566@nibiru.local>
In-Reply-To: <4C9CFCFF.8070102@nextest.com>

* Eric Raible <raible@nextest.com> wrote:
> On 11:59 AM, Enrico Weigelt wrote:
> > * FernandoBasso <FernandoBasso.br@gmail.com> wrote:
> > (use the -ff option on merge if it should show up in history
> > as merge instead of sequential additions - see "fast forward").
> 
> Didn't you mean --no-ff?

Yes, of course ;-o


cu
-- 
----------------------------------------------------------------------
 Enrico Weigelt, metux IT service -- http://www.metux.de/

 phone:  +49 36207 519931  email: weigelt@metux.de
 mobile: +49 151 27565287  icq:   210169427         skype: nekrad666
----------------------------------------------------------------------
 Embedded-Linux / Portierung / Opensource-QM / Verteilte Systeme
----------------------------------------------------------------------