From: Junio C Hamano Date: Wed, 20 Sep 2006 16:05:58 GMT Subject: Re: git pull for update of netdev fails. Message-ID: <7vhcz2jzfd.fsf@assigned-by-dhcp.cox.net> In-Reply-To: <20060920155431.GO8259@pasky.or.cz> Petr Baudis writes: > Dear diary, on Wed, Sep 20, 2006 at 05:28:08PM CEST, I got a letter > where Linus Torvalds said that... >> However, you can tell git that Jeff is being difficult by marking such >> branches individually as being rebased. > > This is really a wrong way of describing the problem - I'd say that Git > is being difficult here. The point is, the subsystem maintainers need to > maintain stacks of patches and rebase against the main kernel branch > regularily, and they want to still publish their current state. So it's > not really any of them being strange or difficult, but Git being so > because it has no seamless support for tracking those branches. Seamless support is there and Linus described how without breaking the usual "if not fast forward you may lose some patches so be extra careful" safety valve. I do not see what your problem is.