git-guide icon indicating copy to clipboard operation
git-guide copied to clipboard

Published 20 hours ago • verified publisher icon rogerdudler

git pull vs. git pull --rebase

Open lsmith77 opened this issue 13 years ago • 3 comments

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.

lsmith77 avatar Jan 18 '12 09:01 lsmith77

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

rogerdudler avatar Jan 18 '12 09:01 rogerdudler

not really sure either ..

maybe:

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

lsmith77 avatar Jan 18 '12 09:01 lsmith77

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

ghost avatar Jan 18 '13 12:01 ghost