On Do, 10.05.18 06:49, Zbigniew Jędrzejewski-Szmek (zbys...@in.waw.pl) wrote:
> 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 No if only github was smart enough to default to "rebase" for single commits and "merge" for multiple commits in a PR... I figure the fix-up case is the clear outlier after all... Lennart -- Lennart Poettering, Red Hat _______________________________________________ systemd-devel mailing list systemd-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/systemd-devel
