My only opinion is that git pull --rebase would probably be "more advanced" for the first time user of Git. In the book, I emphasize that git pull is really git fetch + git merge. With the --rebase switch, git pull uses git rebase, instead of git merge, which sort of brings us back to the top of our thread (rebase v. merge)!