git checkout master
git pull

应该做这份工作。

每次当你在不同于master的分支上工作时，你都会得到“你的分支落后”消息，有人对master进行了更改，而你git拉。

(branch) $ //hack hack hack, while someone push the changes to origin/master
(branch) $ git pull   

现在，源/主引用被拉出，但您的主引用没有与其合并

(branch) $ git checkout master
(master) $ 

现在master在origin/master后面，可以快速前进了

this will pull and merge (so merge also newer commits to origin/master)
(master) $ git pull 

this will just merge what you have already pulled
(master) $ git merge origin/master

现在你的master和原点/master是同步的

如果你站在不同的分支上，想要签出master的最新版本，你也可以这样做

git checkout -B master origin/master

做的事情:

git checkout master
git pull origin

将获取并合并origin/master分支(你可能会说git pull as origin是默认的)。

将分支指针移动到HEAD:

git branch -f master

你的分支主机已经存在，所以Git不允许你覆盖它，除非你使用…-f(这个参数代表——force)

或者你可以使用rebase:

git rebase HEAD master

请自行承担风险;)

在你的例子中，要快进，运行:

$ git merge --ff-only origin/master

这使用了git merge的——ff-only选项，因为问题特别要求“快进”。

下面是git-merge(1)的一个节选，展示了更多的快进选项:

--ff, --no-ff, --ff-only
    Specifies how a merge is handled when the merged-in history is already a descendant of the current history.  --ff is the default unless merging an annotated
    (and possibly signed) tag that is not stored in its natural place in the refs/tags/ hierarchy, in which case --no-ff is assumed.

    With --ff, when possible resolve the merge as a fast-forward (only update the branch pointer to match the merged branch; do not create a merge commit). When
    not possible (when the merged-in history is not a descendant of the current history), create a merge commit.

    With --no-ff, create a merge commit in all cases, even when the merge could instead be resolved as a fast-forward.

    With --ff-only, resolve the merge as a fast-forward when possible. When not possible, refuse to merge and exit with a non-zero status.

我经常快进，以至于它需要一个别名:

$ git config --global alias.ff 'merge --ff-only @{upstream}'

现在我可以快进:

$ git ff

如果你在树枝后面的某个地方， 更安全的做法是将你所做的任何局部更改重新设置为:

git pull --rebase

这有助于防止不必要的合并提交。

(这与执行git fetch && git rebase相同。)