Git pull,Git push不上去问题和解决

问题描述：

输入命令行：$ git push origin master

显示：

To [email protected]:AllenChinese/workSpace.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to '[email protected]:AllenChinese/workSpace.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

输入如下命令行：

$ git config branch.master.remote origin

$ git config branch.master.merge refs/heads/master

然后：

$ git pull

$ git push origin master