Easily get a branch without have to rebase or resolve issues

If you don't care of your local modifications and history, of course
Update tips about git

Improved previous commit according to @gnugat advices :)
Merge pull request #7 from mickaelandrieu/patch-1

Easily get a branch without have to rebase