git pull vs. git pull --rebase

[lsmith77]

the cheat sheet lists "git pull" .. i think as described there its dangerous and will make the main beginner task (keeping in sync with remote code changes without necessarily adding any of their own) needlessly error prone.

[rogerdudler]

Hey Lukas! Any suggestions for writing it the correct way?

[lsmith77]

not really sure either ..

maybe:

merge remote changes into local repository => git pull
synchronize local repository with remote changes => git pull --rebase

[ghost]

Always use rebase when fast-forward isn't possible. Can't tell you enough how much I hate commit messages that only sais "Merge branch 'master' of #repo#".

http://darwinweb.net/articles/the-case-for-git-rebase