> If you are thinking about 'linux-next', it is exception rather than > the rule. No you're wrong. The majority of Linux trees I have to deal with do it now and then. And I must say I also understand why they want it -- they want a clean history on top of Linus' tree. Otherwise there is no chance to find the own changes again after a few thousands other merges. > First, there isn't just _one_ way to deal with non fast-forward > (rebased) branch; there are many possible workflow wrt rebasing. I don't doubt there are a million ways to do it somehow in all kinds of convoluted ways. And that's exactly the problem. The only thing I asked for was that were as a simple standard way that is actually documented in the main documentation and the tutorials and doesn't require lots of strange commands. Not more not less. Right now that's not there as I know from my own experience. Maybe for you people who spend days thinking about git and hacking it these ways are all obvious, but for someone like me who just wants to use the tool it's definitely not easy to do currently. Anyways I'll shut up on this now because it sounds like you people are not interested in improving the tool for non power users. -Andi -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
