mrbigschot
commented
8 years ago I agree that this commit history does look a bit sloppy. I've done some work with git rebase -i on a couple of my other branches, but I've mostly done things like squash or reword to whole commits as opposed to smaller sets of changes, so I might like a demonstration of splitting up/grouping together unrelated/related smaller changes.
Paul, I'm in the process of merging this. In future, it would help if you clean up the history on your branch before posting the pull request. For example, it sometimes takes me three commits to get a change done — the first attempt that doesn't work, the second attempt that does, but is ugly, and the third that puts it right. Moreover, my commit messages are often mis-spelled and sometimes wrong, because I haven't understood the problem yet.
git rebase -i HEAD~9will let you edit the previous 9 commits. You can group related changes into one commit, split out unrelated changes, re-order commits, and so on. This is not a good idea if someone else has pulled your changes, but it's fine to do on a private branch. I just did that with this branch, merging the three sets of changes to the parser into one, but keeping the change to identififerresolution separate. If you would like me to demonstrate the process, I'll be happy to do so.I'll merge my version after all the tests have passed.