phpstorm git pull --rebase
Just use the Version Control -> Update Project
action. There you may choose the way of update: via merge (git pull
) or via rebase (git pull --rebase
) or via the default way for the current branch (it is merge by default).
The action also has more capabilities than Pull: it stashes/slelves your uncommitted changes if you have them, and restores them after update.