From: smurf@smurf.noris.de
Date: Fri, 17 Mar 2006 06:46:18 GMT
Subject: Re: git-cvsimport "you may need to merge manually"
Message-ID: <20060317064618.GG14562@smurf.noris.de>
In-Reply-To: <7vk6at7o06.fsf@assigned-by-dhcp.cox.net>

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:
> 
> 	$ git pull . origin
> 
Exactly.

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

-- 
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."