From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark Lord Subject: Re: libata-dev git question: Date: Sun, 02 Dec 2007 11:48:48 -0500 Message-ID: <4752E1F0.10403@rtr.ca> References: <4752C70F.80506@rtr.ca> <4752CAD0.1040303@pobox.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Return-path: Received: from rtr.ca ([76.10.145.34]:4812 "EHLO mail.rtr.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752046AbXLBQst (ORCPT ); Sun, 2 Dec 2007 11:48:49 -0500 In-Reply-To: <4752CAD0.1040303@pobox.com> Sender: linux-ide-owner@vger.kernel.org List-Id: linux-ide@vger.kernel.org To: Jeff Garzik Cc: Tejun Heo , IDE/ATA development list Jeff Garzik wrote: > Mark Lord wrote: >> I am below "novice" when it comes to git: >> >>> $ git-pull --update-head-ok --tags >>> git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git >>> Warning: No merge candidate found because value of config option >>> "branch.master.merge" does not match any remote branch fetched. >>> No changes. >> .. >> >> Is that "normal" ? > > Yes. > > >> Is that even the correct command to update my entire local existing >> copy of Jeff's git tree? > > No. > > Generally I would use > > cd $repo > git-checkout master # if not already there > git pull # fetches new objects, updates 'master' > git-fetch -f $URL upstream:upstream # fetch updated branch > git-fetch -f $URL mv-ncq:mv-ncq > git-fetch -f $URL upstream-fixes:upstream-fixes > git-fetch -f $URL upstream:upstream > ... continue for each branch you like... > > There is probably an easier way to get it to download all branches, even > if they have been rebased. .. Thanks. I was just going by your KHGTG page until now.