From: Linus Torvalds Date: Mon, 20 Jun 2005 21:15:58 GMT Subject: Re: git merging Message-ID: 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