From mboxrd@z Thu Jan  1 00:00:00 1970
From: smurf@smurf.noris.de
Subject: Re: git-cvsimport "you may need to merge manually"
Date: Fri, 17 Mar 2006 07:46:18 +0100
Message-ID: <20060317064618.GG14562@smurf.noris.de>
References: <86veud23v0.fsf@blue.stonehenge.com> <7vu09x7puo.fsf@assigned-by-dhcp.cox.net> <86r75122yj.fsf@blue.stonehenge.com> <7vk6at7o06.fsf@assigned-by-dhcp.cox.net>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="9UV9rz0O2dU/yYYn"
Cc: "Randal L. Schwartz" <merlyn@stonehenge.com>, git@vger.kernel.org
X-From: git-owner@vger.kernel.org Fri Mar 17 07:55:07 2006
Return-path: <git-owner@vger.kernel.org>
Envelope-to: gcvg-git@gmane.org
Received: from vger.kernel.org ([209.132.176.167])
	by ciao.gmane.org with esmtp (Exim 4.43)
	id 1FK8rU-000400-QT
	for gcvg-git@gmane.org; Fri, 17 Mar 2006 07:55:01 +0100
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752546AbWCQGy4 (ORCPT <rfc822;gcvg-git@m.gmane.org>);
	Fri, 17 Mar 2006 01:54:56 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752547AbWCQGy4
	(ORCPT <rfc822;git-outgoing>); Fri, 17 Mar 2006 01:54:56 -0500
Received: from run.smurf.noris.de ([192.109.102.41]:24786 "EHLO smurf.noris.de")
	by vger.kernel.org with ESMTP id S1752546AbWCQGyz (ORCPT
	<rfc822;git@vger.kernel.org>); Fri, 17 Mar 2006 01:54:55 -0500
Received: from smurf by smurf.noris.de with local (Exim 4.60)
	(envelope-from <smurf@smurf.noris.de>)
	id 1FK8j4-0001a3-UO; Fri, 17 Mar 2006 07:46:18 +0100
To: Junio C Hamano <junkio@cox.net>
Content-Disposition: inline
In-Reply-To: <7vk6at7o06.fsf@assigned-by-dhcp.cox.net>
User-Agent: Mutt/1.5.9i
Sender: git-owner@vger.kernel.org
Precedence: bulk
X-Mailing-List: git@vger.kernel.org
Archived-At: <http://permalink.gmane.org/gmane.comp.version-control.git/17661>


--9UV9rz0O2dU/yYYn
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi,

Junio C Hamano:
> ... Ugh, and after I wrote all of the above, the version of git
> I have at work predates that commit X-<.  So maybe this was
> fixed with that commit, and you are expected to say:
>=20
> 	$ git pull . origin
>=20
Exactly.

> assuming that you are on "master" branch and cvsimoprt tracks
> CVS head with "origin" branch, that is.
>=20
> Smurf, help?
>=20
What for? You got it, after all. *g*

--=20
Matthias Urlichs   |   {M:U} IT Design @ m-u-it.de   |  smurf@smurf.noris.de
Disclaimer: The quote was selected randomly. Really. | http://smurf.noris.de
 - -
Sally sued for support; she was claimin'
Phil had fathered her baby (named Damon).
    She said, "I ought to know,"
    As she pointed below.
"'Cause this is the box that he came in."

--9UV9rz0O2dU/yYYn
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)

iD8DBQFEGls68+hUANcKr/kRAsrVAJ9Lcz7ixjqUF72qazlla0O2yiSkXgCfc6eK
KJDn65gB6f0YvUpKFQ4oFbM=
=yUUa
-----END PGP SIGNATURE-----

--9UV9rz0O2dU/yYYn--