github merge rules update

[zbyszek@xxxxxxxxx (Zbigniew Jędrzejewski-Szmek)]

To systemd repo committers:

an investigation in https://github.com/systemd/systemd/issues/8665
done by filbranden showed that github's "rebase & merge" button works
better than the "squash & merge" version. The authorship and original
timestamps on the commit are not mangled. Hence, let's mostly use
"rebase & merge" for single commits instead of "squash & merge".

New rules:
â?? single commit â?? rebase
â?? a bunch of fixup commits that should be one â?? squash
â?? more than one commit â?? merge

Zbyszek