Confusing commit history due to squash merge from dev to master

[sparrowt]

As noticed and raised here #86 (comment) I think the master branch has been - perhaps unintentially - deprived of some useful commit history due to #124 being squash merged.

Resulting issues:

• git blame will be less useful in future on master with changes being attributed to the "Prepare for 1.1.3 release" commit instead of the original commit which references the issue & explains what was being fixed
• commits appear to be missing from master even though in fact they are on there, e.g. master...dev is far longer than it should be
• also the reverse diff is non-zero which seems wrong dev...master - dev should have everything that's on master (+ potentially new unrelease stuff) so there shouldn't be code changes on master which show up as being missing from dev

One set of steps to resolve this would be:

1. force push master to HEAD~1 (i.e. 'undo' c0476cf)
2. then create a new branch checked out from 1779a24 (where dev was when Prepare for 1.1.3 release #124 was opened)
3. create a PR from this new branch to master and merge it in a non-squashing way

Any thoughts?

[jmah8]

Yes, you are correct about that. We accidentally squash committed. We are planning to fix it during the next release, but we can fix it sooner if you prefer.

[sparrowt]

Ah brilliant - I don't mind when as long as it is resolved at some point - thanks!

[jmah8]

This is fixed by PR #146. I am going to close this issue, but feel free to reopen it if there are still concerns about the commit history.

[sparrowt]

Thank you!