git pull = git fetch remotebranch + git merge newstuff git pull --rebase = git fetch remotebranch + git rebase newstuff Standard merge feathers commits togeth

git pull = git fetch remotebranch + git merge newstuff git pull --rebase = git fetch remotebranch + git rebase newstuff Standard merge feathers commits together. Rebase looks at your new changes, puts them aside, brings in the remotebranch's changes, and then replays all your new changes on top of the remotebranch. This is great because it makes YOUR changes truly new, and you can handle all your conflicts once. http://darwinweb.net/articles/86 http://darwinweb.net/articles/86