> Note: before doing rebases etc. I'd advise to push your current tree to
> a separate branch that you can always restart from, to avoid risking
> losing everything. There are ways to restore things, but it's way easier
> to just keep a branch on the side where you know your changes are safe.
At first, I'm doing manually, without rebase. My commit history is very dirty, and the commit squash is complicated.
I have a clone of the "master" branch from upstream gnumach, and I'm creating a new branch derived from It, in which I'm adding manually the latest changes to commit.
I'll late a bit