Closed brycx closed 2 years ago
Thanks :) Just FYI for the future I prefer my commits to be merged unsquashed, so that it's clear who made which changes (e.g. for git blame
).
Just FYI for the future I prefer my commits to be merged unsquashed, so that it's clear who made which changes (e.g. for git blame).
Thanks for letting me know. I generally prefer squashed to keep the git log
clean, but I'll try to keep this in mind as much as possible. If a PR collects too many commits however, then I might opt for squashing regardless.
I have nothing against squashing per se. I just don't like squashing commits from different authors together. Note that with git rebase -i
you can easily squash only specific commits (by fixing them up).
I'll look into git rebase -i
and keep the different authors point in mind. I get how you mean squashing probably wasn't the best choice for this PR.
I love interactive rebases^^ it lets you easily rearrange commits, reword specific commit messages, edit specific commits etc.
There were some ref issues preventing me from pushing to upstream, so I made a new PR just since it was quicker.
Replacement of #25 (where discussion is located)