git rebase on pull
One way of getting a more linear history in git is to do rebase on pull. Run git config --global...
Tags: git