From mboxrd@z Thu Jan 1 00:00:00 1970 From: Avi Kivity Subject: Re: [RFC][PATCH 5/6][KVM VIRTIO] Add the network device code Date: Sun, 09 Sep 2007 15:56:59 +0300 Message-ID: <46E3ED9B.30803@qumranet.com> References: <64F9B87B6B770947A9F8391472E032160D59005E@ehost011-8.exch011.intermedia.net> <200708271422.54306.borntraeger@de.ibm.com> <64F9B87B6B770947A9F8391472E032160D6558CB@ehost011-8.exch011.intermedia.net> <46D59029.5080403@cs.ualberta.ca> <68676e00708290836n375c7501o727ec1cc2b998865@mail.gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: kvm-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org To: Luca Return-path: In-Reply-To: <68676e00708290836n375c7501o727ec1cc2b998865-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kvm-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org Errors-To: kvm-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org List-Id: kvm.vger.kernel.org Luca wrote: > On 8/29/07, Cam Macdonell wrote: > >> Dor Laor wrote: >> >>> The code can now be accessed by git: >>> git://kvm.qumranet.com/home/dor/src/virtio/kvm (kernel) and >>> git://kvm.qumranet.com/home/dor/src/virtio/kvm-userspace. >>> branch name virt-final. >>> --Dor >>> >> I'm really new to git and don't quite grasp it's subtleties. Do I have >> to "git clone" your kvm kernel and user-space repos or is there some way >> to use your branch as a branch off Avi's? I tried finding an online >> reference, but none seem to cover this kind of setup. >> > > If Dor's repository is based on the Avi's one (I think so) you can > pull virt-final branch as a branch of you existing repository (see > refspec parameter in git-pull). This is error prone though (after a > while I tend to pull the wrong tree into the wrong branch ;-) ) > I prefer to clone the whole tree (disk space is cheap...), sharing GIT > object where possible, e.g. > > git clone --reference kvm.avi > git://kvm.qumranet.com/home/dor/src/virtio/kvm kvm.dor > > where kvm.avi is you existing kvm git repository. > My preference pulling random branches and repos is 'git fetch' (or, for longer lived branches, 'git remote') which doesn't cause fake merges. -- error compiling committee.c: too many arguments to function ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/