Page History

...

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

or simply viewing the commits list on github.

After a one week bake-in period, enforce new strategy with .asf.yaml:

github:
  enabled_merge_buttons:
    # enable merge button
    merge: true
    # disable squash button
    squash: false
    # disable rebase button
    rebase: false

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.

...

1. DISCUSS
2. VOTE
3. TRACK (update community, update docs, remind ourselves via dev list, chat, PR comments)
4. CLOSE

If adopted, and after a couple weeks, we might make further changes to our .asf.yaml, such as:

github:
  protected_branches:
    develop:
      required_linear_history: false
      required_signatures: true
      required_conversation_resolution: true