There are some files where you mostly or only do coding style changes. You can copy them to a new branch with

```
git checkout upstream/master # or what ever that branch is in your local clone
git checkout -b codingstlye
git checkout LibraryConcurrencyRefactoring src/trackinfoobject
```

git also has the ability create patches per file. So you can create them for files like trackinfoobject delete few lines that do apply to this branch and then apply the patch to clean checkout from upstream/master. I would merge these directly into master then. But only do it if you have extra time, it was just a quick idea.