At Sunday 08 August 2010, Ralf Wildenhues wrote: > Well, if it helps you, there is no need to maintain a linear > history in the maint branch. You can also just merge your (fixed) > patches from the branches where you have them, that is fine with > me as well. No need to rebase or cherry-pick the patches if that > would mean more work for you. Good to know, I'll keep that in mind if I ever encounter a real hurdle with my git workflow. For the moment, though, "git rebase" and "git am -3" work like a charm. > Does that make sense to you? I think so :-)
Regards, Stefano
