Messages in this thread | | | From | Michael Ellerman <> | Subject | Re: git process question | Date | Wed, 19 Apr 2017 20:39:57 +1000 |
| |
Steven Rostedt <rostedt@goodmis.org> writes:
> Hi Linus, > > I have a minor bug I found and a fix for it. I'm currently putting it > through the grind and will send it to you for this rc release cycle. > > Here's the question. My current linux-next development depends on this > fix. I already posted work to linux-next and do not want to rebase. > Would it be OK to cherry pick this change that I send to you, which > will be based on a commit in your tree, into my development branch > where I can continue the work on top of the previous development that's > in linux-next and the fix? ... > The alternatives are, ... > 2) Merge the development and urgent branches and continue working on > that. But I understand that you really don't like it when people do that. ^^^^^^^^^^^^^^^^^^^^ Is this part actually true?
I ask because I have done it a few times and thought it was OK in general if there's a good reason for it.
I make a point of using the same base for my fixes and next branches (ie. usually some rc), and then I don't fast forward my fixes branch when Linus merges it, or otherwise put anything in there other than the actual fixes. That means if I do merge it into next it doesn't bring anything else with it.
cheers
| |