Page History

...

Standardize on and manually enforce traditional git merge commits for merging approved PRs to the develop branch. When merging a PR, do not enforce squash/rebase/fast-forward.

For examining history, document and practice use of git history simplification strategies such as

git log --first-parent develop
git log --no-merges
git log --max-parents=1

or simply viewing the commits list on github.

Alternatives Considered

Continue to enforce squash/rebase/fast-forward, but do so locally only, so committer's signature is valid. Abandoned as this would leave behind useless merge commit "triangles" in the history.

...