> I hate rebases because they create multiple hashes for the same logical commit Some of those commits may have changed (either the commit message or the diff

> I hate rebases because they create multiple hashes for the same logical commit Some of those commits may have changed (either the commit message or the diff itself). There's a git command called range-diff[1] that was added recently that allows you to diff between rebases. > Also, they tend to involve more manual processing, and thus human error, then merges. Before actually pushing up the rebased branch, you run a diff against the upstream tracking branch to see if any inadvertent changes were introduced. For example: git diff @{u}.. And use the range-diff command to see the difference between the upstream tracking branch and your locally rebased branch. [1] https://git-scm.com/docs/git-range-diff https://git-scm.com/docs/git-range-diff