Solved How to patch some parts of the source code using a RK356X-diff file...

[sidetone]

Git is difficult for me. I learned enough to do essential tasks with it. Then, I forgot it. I read an open source book and other documentation. I eventually had to ask for help on IRC on how to do final steps, which I couldn't find the description of. Barely understood it enough to do it.

Here's an open source book. Not sure if it's the same one I've used before.

Git

git-scm.com

Of the book I read, the first two or three chapters and a few other parts helped me. Then, a lot, I couldn't make use of.

It's available in epub and PDF. If you want to read it on the terminal, get the epub and use textproc/py-epy-reader. The command is epy. Manpages are good to learn from too. In the case of Git, I needed additional help from those resources. Try before asking. It's not always easy, but it teaches you.

I do know, often when I ask for help, I actually remember it for the time needed.

 

[T-Aoki]

Maybe this document by bsdimp would be helpful.

And documents for creating diff using git on Internet usually assumes using branches for the cases new files are added.

Assuming casual developer and/or tester like me, usually (no additions) git diff > diff-to-be-generated at the top of a repo (i.e., /usr/src and /usr/ports) to create diffs are sufficient. But it doesn't handle newly added files unless git add is done in preparation of commits.

For anyone who don't want to pollute git commit logs but want to create diffs including newly added files, the procedure below would help.

git stash --include-untracked
git stash show -p --include-untracked > diff-to-be-created
git stash pop

To create diffs to upload to Phablicator via web UI, additional option -U999999 is wanted in both cases.