From: Eric Raible Date: Fri, 24 Sep 2010 19:33:19 GMT Subject: Re: Re: Really beginner on Version Control Message-ID: <4C9CFCFF.8070102@nextest.com> In-Reply-To: <20100921145922.GA14711@nibiru.local> On 11:59 AM, Enrico Weigelt wrote: > * FernandoBasso 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?