Configuration Set up global configuration variables if you haven’t done so
$ git config --global user.name "<name>" $ git config --global user.email "<email>" Git should automatically do a rebase when you do a pull, which is what you want
$ git config branch.autosetuprebase always To set up configuration for DiffMerge, follow the guide http://coding4streetcred.com/blog/post/configure-diffmerge-for-your-git-difftool.
Local Usage of Git Staging Check if there is any unstaged or untracked files