Messages in this thread | | | Date | Thu, 19 Oct 2006 23:17:27 +0200 | From | Pierre Ossman <> | Subject | Git training wheels for the pimple faced maintainer |
| |
Hi guys,
In an effort to change my work flow into a manner that is more suitable for upstream merging and publishing my trees, I though I could ask for some input from the more experienced.
My intended work flow is to work on stuff on temporary topic branches, and cherry-pick or diff|patch them into other trees when they are mature enough.
Stuff that need a bit more testing will be put in a public "for-andrew" branch. From what I gather, Andrew does a pull and a diff of these kinds of branches before putting together a -mm set. So this should be sufficient for your needs? Do you also prefer getting "[GIT PULL]" requests, or do you do the pull periodically anyway?
Patches that are considered stable, either directly or by virtue of being in -mm for a while, will be moved into a "for-linus" tree and a "[GIT PULL]" sent to herr Torvalds.
Now, the patch in "for-linus" will be a duplicate of one or several commits in "for-andrew". Will I get any problems from git once I do a new pull from Linus' tree into "for-andrew"?
Another concern is all the merges. As I have modifications in my tree, every merge should generate at least one commit and one tree object. Is this kind of noise in the git history something that needs concern?
Looking forward to your kind words and ruthless flames :)
Rgds -- -- Pierre Ossman
Linux kernel, MMC maintainer http://www.kernel.org PulseAudio, core developer http://pulseaudio.org rdesktop, core developer http://www.rdesktop.org - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |