> > Suppose that I checkout the v3 branch, and fix the bug by editing > several different files. (Lets assume for now that the files in > question have not diverged between any of the 3 branches, even though > tons of other files have changed). How do I commit the bugfix into > all of v3, v4 and v5? Clearly, merging the branches together would be > bad. So I think what I should do is perform 3 different commits, but > I'm not quite sure how to juggle the git index (or stash or whatever) > to accomplish this. This may be a really obvious question, but I'm a > confused git newbie. It as not as clear for me why you think merge will be bad? If you commit your changes to the v3, then merging to v4 and v5 (which are not changed) should be very simple fast forward merge. Which means just move the pointer to the last commit from v3 Am i missing something? Thanks, Eugene -- 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