From mboxrd@z Thu Jan  1 00:00:00 1970
From: Eric Raible <raible@nextest.com>
Subject: Re: Re: Really beginner on Version Control
Date: Fri, 24 Sep 2010 12:33:19 -0700
Message-ID: <4C9CFCFF.8070102@nextest.com>
References: <1285080133451-5555023.post@n2.nabble.com> <20100921145922.GA14711@nibiru.local>
Mime-Version: 1.0
Content-Type: text/plain; charset="ISO-8859-1"
Content-Transfer-Encoding: 7bit
Cc: <weigelt@metux.de>
To: <git@vger.kernel.org>
X-From: git-owner@vger.kernel.org Fri Sep 24 21:33:35 2010
Return-path: <git-owner@vger.kernel.org>
Envelope-to: gcvg-git-2@lo.gmane.org
Received: from vger.kernel.org ([209.132.180.67])
	by lo.gmane.org with esmtp (Exim 4.69)
	(envelope-from <git-owner@vger.kernel.org>)
	id 1OzE1X-0002sz-6J
	for gcvg-git-2@lo.gmane.org; Fri, 24 Sep 2010 21:33:35 +0200
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1756482Ab0IXTd3 (ORCPT <rfc822;gcvg-git-2@m.gmane.org>);
	Fri, 24 Sep 2010 15:33:29 -0400
Received: from exchange.domain1.nextest.com ([12.96.234.114]:34369 "EHLO
	Exchange.DOMAIN1.nextest.com" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1751767Ab0IXTd3 (ORCPT
	<rfc822;git@vger.kernel.org>); Fri, 24 Sep 2010 15:33:29 -0400
Received: from [131.101.151.88] (131.101.151.88) by
 Exchange.DOMAIN1.nextest.com (131.101.21.39) with Microsoft SMTP Server (TLS)
 id 8.2.254.0; Fri, 24 Sep 2010 12:33:27 -0700
User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.9) Gecko/20100915 Lightning/1.0b2 Thunderbird/3.1.4
In-Reply-To: <20100921145922.GA14711@nibiru.local>
Sender: git-owner@vger.kernel.org
Precedence: bulk
List-ID: <git.vger.kernel.org>
X-Mailing-List: git@vger.kernel.org
Archived-At: <http://permalink.gmane.org/gmane.comp.version-control.git/157043>

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?