git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Linus Torvalds <torvalds@osdl.org>
To: Jens Axboe <axboe@suse.de>
Cc: Daniel Barkalow <barkalow@iabervon.org>,
	Jeff Garzik <jgarzik@pobox.com>,
	Git Mailing List <git@vger.kernel.org>
Subject: Re: git merging
Date: Mon, 20 Jun 2005 14:15:58 -0700 (PDT)	[thread overview]
Message-ID: <Pine.LNX.4.58.0506201410050.2268@ppc970.osdl.org> (raw)
In-Reply-To: <20050620203821.GC7712@suse.de>



On Mon, 20 Jun 2005, Jens Axboe wrote:
> 
> I pulled with rsync manually from kernel.org, and that did fix things up
> for me. The main tree is rsync'ed, but the development tree gets the
> changes with /opt/kernel/git/linux-2.6/.git/ as the url given to
> git-pull-script.

Ok, that explains it. Since you're using a regular local filename, the
pull will be using "git-local-pull", which will only fetch the objects
directly needed. And doesn't understand the tag-to-tree thing, so doesn't 
fetch the tree (or possibly you just copied the tags by hand totally 
outside of the regular pull?)

		Linus

  reply	other threads:[~2005-06-20 21:30 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20050617133440.GI6957@suse.de>
     [not found] ` <Pine.LNX.4.58.0506170937260.8487@ppc970.osdl.org>
     [not found]   ` <20050617175653.GS6957@suse.de>
     [not found]     ` <Pine.LNX.4.58.0506171101450.2268@ppc970.osdl.org>
     [not found]       ` <20050617181156.GT6957@suse.de>
     [not found]         ` <Pine.LNX.4.58.0506171132390.2268@ppc970.osdl.org>
     [not found]           ` <20050617183914.GX6957@suse.de>
2005-06-17 18:50             ` git merging Linus Torvalds
2005-06-17 19:16               ` Jens Axboe
2005-06-17 23:08               ` Jeff Garzik
2005-06-17 23:31                 ` Linus Torvalds
2005-06-17 23:51                   ` Jeff Garzik
2005-06-18  0:13                     ` Linus Torvalds
2005-06-20 12:30                       ` Jens Axboe
2005-06-20 13:48                         ` Matthias Urlichs
2005-06-20 14:13                           ` Jens Axboe
2005-06-20 15:58                         ` Linus Torvalds
2005-06-20 16:06                           ` Daniel Barkalow
2005-06-20 19:21                             ` Matthias Urlichs
2005-06-20 20:38                           ` Jens Axboe
2005-06-20 21:15                             ` Linus Torvalds [this message]
2005-06-21 14:59                               ` Jens Axboe
2005-06-21 15:53                                 ` Linus Torvalds

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

  List information: http://vger.kernel.org/majordomo-info.html

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

  git send-email \
    --in-reply-to=Pine.LNX.4.58.0506201410050.2268@ppc970.osdl.org \
    --to=torvalds@osdl.org \
    --cc=axboe@suse.de \
    --cc=barkalow@iabervon.org \
    --cc=git@vger.kernel.org \
    --cc=jgarzik@pobox.com \
    /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. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).