Please, oh please, use git pull --rebase

Here a very short article : Please, oh please, use git pull --rebase

Shorter : stop locally merging the changes of the remote branch. The historic looks messy ...

Mentioned in issue #18 (closed)

@jtarraso Hi Jaime, please consider this issue as it seems you often merge branches from the remote repo to your local copy.

The command git pull is actually a shortcut for git fetch + git merge.

Using the --rebase option simply fetch the changes on the remote repo and rebase your local changes on top of it.

This mainly helps keeping the history clean and is less error-prone than a simple pull.

Oh, I see. I mainly used the default git pull QtCreator came with. I will search how to do the --rebase option then.

@joanvallve please have a look here

closing

closed