[vlc-devel] Git rebase vs merge (and pull)

[Pierre d'Herbemont]

Hi,

A small note to committer.

First you sometimes create merge, when you don't want to. That's  
because you used git pull.

git pull: is equivalent to git fetch && git merge

git pull --rebase however is equivalent to git fetch && git rebase

If git says, "git pull --rebase" no such option, your git version is  
outdated.

 From http://git.or.cz/
> The latest stable Git release is v1.5.4.3:

Happy coding,

Pierre.