@mergan "pulling" really means "fetching" (i.e. having your local git ask the server what stuff it has and download that stuff) and also setting local branch to whatever you told it to. So when I do "git pull origin master" it essentially does equivalent of "git fetch origin" (downlad stuff) and then something like "git checkout -b master origin/master" (switch to "master" branch and update it to point to "origin/master" (local copy of remote branch)) (it doesn't actually do that but that's details).

cherry-picking is when you essentially take a commit, extract whatever changes were happening to it and apply those changes on a new context, essentially creating a clone of that commit, as far as changes, messages, authorship etc concerned. A rebase is essentially a series of cherry-picks (plus updating the branch pointer)