How do I bring in changes from another branch without merging?

git checkout my-branch
git rebase other-branch

Do not rebase if someone else is working on my-branch too. It changes the git history so that the commits on my-branch will have different commit IDs, and so the other developer’s branch will end up in a weird state next time they pull your changes.

Further Reading

• Git Rebase guide by Ben Marshall
• git rebase official docs