From: Johannes Schindelin Date: Wed, 20 Sep 2006 16:02:43 GMT Subject: Re: git pull for update of netdev fails. Message-ID: In-Reply-To: <20060920155431.GO8259@pasky.or.cz> Hi, On Wed, 20 Sep 2006, Petr Baudis wrote: > 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. So, what exactly do you propose? I do not see any way to help this problem, since you really throw away history. So, the git-is-being-difficult has to be taken with a pound of salt here. Ciao, Dscho