git merge vs rebase - which one rewrites history

Yes. Rebase replays your commits on top of the other branch, they get new hashes. Merge keeps both histories and adds a merge commit.

Rule: don't rebase a branch others have already pulled. Rebasing your own feature branch before a PR is fine.