Recent a committer accidentally clicked the merge button on a PR *without* choosing the type of merge to be squash. Really anyone could easily make this mistake; it's so easy. The default is the first listed which is a regular merge commit. Consequently, our Git History is... well you can see it for yourself :-(
I filed this with infra so that it doesn't happen again: INFRA-19333 - Github: only want "Allow squash merging" <https://issues.apache.org/jira/browse/INFRA-19333> https://issues.apache.org/jira/browse/INFRA-19333 If only Git had a way to undo accidental pushes to a shared repo that doesn't cause distributed-pain. Sigh. ~ David Smiley Apache Lucene/Solr Search Developer http://www.linkedin.com/in/davidwsmiley
