git pull --rebase removes unpushed merge commits. Is there a way to make it preserve them?
git pull --rebase
Say my history looks like—
A | \\ B H | |
you can split your pull in a fetch and a rebase
pull
fetch
rebase
git fetch origin master git rebase origin master --preserve-merges