From: Linus Torvalds Date: Tue, 21 Jun 2005 15:53:00 GMT Subject: Re: git merging Message-ID: In-Reply-To: <20050621145919.GB12271@suse.de> On Tue, 21 Jun 2005, Jens Axboe wrote: > > 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? Yes, I'm not claiming it's good, I'm just claiming it explains what you see ;) So it's a bug, but I'm hoping somebody else will fix it. I've not actually worked on that "intelligent pull" functionality at all (aside from making the ssh-push thing work for my limited use). Linus