GitLab

Main clang-format in master ended up sreading over three commits, we
have to handle them as a single merge when updating the branches
(reduces noise in commits).

Previous commit was doing bad diffing against master, not against actual
clang-format commit.

Also ensure we do not go beyond windows' commandline limits (8191
chars...) in case of long list of files to reformat, in that case just
reformat everything.

We can quiet easily get a list of files being different between master
and newly rebased branch, and only reformat those ones.

Note that list of different files is way too big still, for some
reasons... This still makes the overall script way faster to run in
typical cases.

When we rebase with recursive merge strategy, the ours/theirs branches
are actually reversed compared to an actual merge, so we need to use
-Xtheirs conflict resolution strategy, instead of -Xours.

Avoids possible issues running outside the source code directory.

In some cases one has a hierarchy of branches built one on top of the other,
this option allows to merge or rebase from another branch than master.

Still needs the hash for the commit that introduces clang-format in master
to actually work.

Needed for callers that accumulate data to a global variable.

While non yet exist in git, this is useful in some cases.

Building all doxygen docs takes a long time,
while this will miss inter-file references, it's useful to check basic
formatting is correct.