From mboxrd@z Thu Jan  1 00:00:00 1970
From: Rene Herman <rene.herman@keyaccess.nl>
Subject: Re: git pull versus fetch/merge
Date: Mon, 21 Jul 2008 13:39:37 +0200
Message-ID: <48847579.5080006@keyaccess.nl>
References: <488452D6.1060508@keyaccess.nl> <20080721102320.GA19776@atjola.homenet> <48846BC2.4090407@keyaccess.nl> <20080721110900.GA8550@sigill.intra.peff.net> <48847344.5060908@keyaccess.nl> <20080721113352.GA21009@atjola.homenet>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-15;
	format=flowed
Content-Transfer-Encoding: QUOTED-PRINTABLE
Cc: Jeff King <peff@peff.net>, git@vger.kernel.org,
	Takashi Iwai <tiwai@suse.de>
To: =?ISO-8859-15?Q?Bj=F6rn_Steinbrink?= <B.Steinbrink@gmx.de>
X-From: git-owner@vger.kernel.org Mon Jul 21 13:38:29 2008
Return-path: <git-owner@vger.kernel.org>
Envelope-to: gcvg-git-2@gmane.org
Received: from vger.kernel.org ([209.132.176.167])
	by lo.gmane.org with esmtp (Exim 4.50)
	id 1KKtii-0004Lu-6P
	for gcvg-git-2@gmane.org; Mon, 21 Jul 2008 13:38:24 +0200
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1750954AbYGULhY convert rfc822-to-quoted-printable (ORCPT
	<rfc822;gcvg-git-2@m.gmane.org>); Mon, 21 Jul 2008 07:37:24 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750719AbYGULhY
	(ORCPT <rfc822;git-outgoing>); Mon, 21 Jul 2008 07:37:24 -0400
Received: from smtpq2.tilbu1.nb.home.nl ([213.51.146.201]:44265 "EHLO
	smtpq2.tilbu1.nb.home.nl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751498AbYGULhY (ORCPT <rfc822;git@vger.kernel.org>);
	Mon, 21 Jul 2008 07:37:24 -0400
Received: from [213.51.146.190] (port=55513 helo=smtp1.tilbu1.nb.home.nl)
	by smtpq2.tilbu1.nb.home.nl with esmtp (Exim 4.60)
	(envelope-from <rene.herman@keyaccess.nl>)
	id 1KKthi-0008Ln-OT; Mon, 21 Jul 2008 13:37:22 +0200
Received: from cc334381-b.groni1.gr.home.nl ([82.73.12.33]:41586 helo=[192.168.0.3])
	by smtp1.tilbu1.nb.home.nl with esmtp (Exim 4.60)
	(envelope-from <rene.herman@keyaccess.nl>)
	id 1KKthi-0000Aw-HI; Mon, 21 Jul 2008 13:37:22 +0200
User-Agent: Thunderbird 2.0.0.14 (X11/20080421)
In-Reply-To: <20080721113352.GA21009@atjola.homenet>
X-Spam-Score: -1.0 (-)
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/89351>

On 21-07-08 13:33, Bj=F6rn Steinbrink wrote:

>> rene@7ixe4:~/src/linux/7ixe4$ git --version
>> git version 1.5.5
>=20
> Broken in 1.5.5 and 1.5.5.1, Jeff's fix went into 1.5.5.2. Bad luck ;=
-)

Sheesh. Thanks :-)

Rene.