From: Jens Axboe Date: Tue, 21 Jun 2005 14:59:20 GMT Subject: Re: git merging Message-ID: <20050621145919.GB12271@suse.de> In-Reply-To: On Mon, Jun 20 2005, Linus Torvalds wrote: > > > 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?) Isn't that a little 'end user' confusing from a usability point of view, that it behaves differently depending on which pull script it ends up using in the end? I guess I can just always use rsync even for local trees. And use it directly, so I always have everything :) -- Jens Axboe