linux-ide.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff Garzik <jgarzik@pobox.com>
To: Mark Lord <liml@rtr.ca>
Cc: Tejun Heo <htejun@gmail.com>,
	IDE/ATA development list <linux-ide@vger.kernel.org>
Subject: Re: libata-dev git question:
Date: Sun, 02 Dec 2007 10:10:08 -0500	[thread overview]
Message-ID: <4752CAD0.1040303@pobox.com> (raw)
In-Reply-To: <4752C70F.80506@rtr.ca>

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.

	Jeff



  reply	other threads:[~2007-12-02 15:10 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-12-02 14:54 libata-dev git question: Mark Lord
2007-12-02 15:10 ` Jeff Garzik [this message]
2007-12-02 16:48   ` Mark Lord
2007-12-03  4:33 ` Tejun Heo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4752CAD0.1040303@pobox.com \
    --to=jgarzik@pobox.com \
    --cc=htejun@gmail.com \
    --cc=liml@rtr.ca \
    --cc=linux-ide@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).