git pull with rebase
Posted February 6, 2013on:
git pull –rebase
without rebase, it pulls the changes in depot and does a merge with the current branch.
with rebase, it pulls the changes in depot and applies your changes on top of those.
the difference is in the history: one is a merge, the other is a straight line going forward.
you can also set the following in your ~/.gitconfig file
autosetuprebase = always
This article explains well.