I work in a company where we maintain Linux kernel and make few
changes on top of it. I have a public Linux kernel (by public I mean
internal to company however, few employees have cloned from the
repository). The version of Linux kernel is 3.0 and with few changes
on master branch.
Now I want to pull the latest kernel 3.1-rc7 and apply our patches on
top it. We are very much sure that our existing changes would not
cause any conflict. I was thinking about rebasing the code, however
the book "Pro Git" says "Do not rebase commits that you have pushed to
a public repository.".
Now I am confused. Can someone help?
Thanks in advance.
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To post to this group, send email to firstname.lastname@example.org.
To unsubscribe from this group, send email to
For more options, visit this group at