On Tue, 26 Aug 2008, Russell King - ARM Linux wrote: > The point is that my git usage does _not_ match with the requirements > brought on by publishing the git tree, and therefore it should _not_ > be published in the first place. The only reason it is published is > because people like you vocally demand it to be so. It's not my > choice. And I greatly appreciate your doing so. > That requirement is that once a commit has been published, it becomes > immutable. That requirement is there so that people _can_ work off > your published tree. If you're not sure of the work you have in your > git tree, you shouldn't be publishing those commits. That's not all black or white. Many people have branches which are rebased all the time, especially when those branches are made up of other evolving branches. I Think this is the case of your devel branch which sounds pretty fine to me. As long as the volatile nature of such branch is clearly advertised and people are told not to base their own work on of course, and I think you did so many times now. Especially with a git tree containing multiple branches, one must be wise enough not to pick one at random and use that to commit stuff on top. This is where the tool, as good as it may be, still isn't a replacement for proper communication. When in doubt, people should just ask. What is discouraged though, is the republishing of stuff that you were asked to pull and that you rebased locally. If other people's stuff have to be rebased for whatever reason then it is best to simply drop that stuff and ask the originator to rebase it and then repull. > It's only going to be a matter of time before there's another chorus of > people demanding that I yet again change the way I work, demanding that > I conform... I don't think you have to change the way you work now, and IMHO you already conform to the git usage of the majority of Linux maintainers. Nicolas -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
