From mboxrd@z Thu Jan 1 00:00:00 1970 From: Enrico Weigelt Subject: Re: Re: Really beginner on Version Control Date: Fri, 24 Sep 2010 22:18:39 +0200 Message-ID: <20100924201839.GB29566@nibiru.local> References: <1285080133451-5555023.post@n2.nabble.com> <20100921145922.GA14711@nibiru.local> <4C9CFCFF.8070102@nextest.com> Reply-To: weigelt@metux.de Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Mon Sep 27 02:57:56 2010 Return-path: 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 ) id 1P022S-0000bI-Qg for gcvg-git-2@lo.gmane.org; Mon, 27 Sep 2010 02:57:53 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758656Ab0I0A5m (ORCPT ); Sun, 26 Sep 2010 20:57:42 -0400 Received: from caprica.metux.de ([82.165.128.25]:38714 "EHLO mailgate.caprica.metux.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754544Ab0I0A5l (ORCPT ); Sun, 26 Sep 2010 20:57:41 -0400 Received: from mailgate.caprica.metux.de (localhost.localdomain [127.0.0.1]) by mailgate.caprica.metux.de (8.14.4/8.14.4) with ESMTP id o8R0h6jh016814 for ; Mon, 27 Sep 2010 02:58:30 +0200 Received: (from uucp@localhost) by mailgate.caprica.metux.de (8.14.4/8.14.4/Submit) with UUCP id o8QLQxdn020905 for git@vger.kernel.org; Sun, 26 Sep 2010 23:26:59 +0200 Received: (from weigelt@localhost) by nibiru.metux.de (8.12.10/8.12.10) id o8OKIduZ001022 for git@vger.kernel.org; Fri, 24 Sep 2010 22:18:39 +0200 Mail-Followup-To: git@vger.kernel.org Content-Disposition: inline In-Reply-To: <4C9CFCFF.8070102@nextest.com> User-Agent: Mutt/1.4.1i X-Terror: bin laden, kill bush, Briefbombe, Massenvernichtung, KZ, X-Nazi: Weisse Rasse, Hitlers Wiederauferstehung, 42, X-Antichrist: weg mit schaeuble, ausrotten, heiliger krieg, al quaida, X-Killer: 23, endloesung, Weltuntergang, X-Doof: wer das liest ist doof Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: * Eric Raible wrote: > 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? 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 ----------------------------------------------------------------------