转载： Git：git-pull 的用法总结

博客：IT老兵驿站。

语法
git pull的作用是从一个仓库或者本地的分支拉取并且整合代码。

git pull [<options>] [<repository> [<refspec>…​]]

描述

git pull相当于 git fetch 跟着一个 git merge FETCH_HEAD。repository是仓库的名字，refspec 是分支的名字。如果都不写，会有一个默认值。

一个例子：

     A---B---C master on origin
	/
D---E---F---G master
	^
    origin/master in your repository

远程的master分支到了C，本地的开发到了G。

	 A---B---C origin/master
	/         \
D---E---F---G---H master

git pull之后会生成一个新的H，合并两个分支。
如果发生了冲突，可以使用git reset --merge进行回退。

options（选项）
下面摘录几个常用的选项。

–allow-unrelated-histories
By default, git merge command refuses to merge histories that do not share a common ancestor. This option can be used to override this safety when merging histories of two projects that started their lives independently. As that is a very rare
occasion, no configuration variable to enable this by default exists and will not be added.

允许无关的历史，这个选项，更多是在更改远程仓库的时候用到。

–ff
When the merge resolves as a fast-forward, only update the branch pointer, without creating a merge commit. This is the default behavior.
–no-ff
Create a merge commit even when the merge resolves as a fast-forward. This is the default behaviour when merging an annotated (and possibly signed) tag that is not stored in its natural place in refs/tags/ hierarchy.
–ff-only
Refuse to merge and exit with a non-zero status unless the current HEAD is already up to date or the merge can be resolved as a fast-forward.

ff选项，这几个选项是说合并时是否开启fast-forward，快速合并，这个有在另外一篇帖子中详细讲解，这里就不赘述了。

实例：**默认使用方式，按照git branch 设置的默认跟踪的服务器和分支来拉取。

git pull

实例： 拉取远程服务器origin的master分支

git pull origin master

总结
git-pull的用法先总结到这里，还有很多需要细化的地方，一口吃不下，需要一口一口来。

参考
https://git-scm.com/docs/git-pull
https://www.atlassian.com/git/tutorials/syncing/git-pull

————————————————
版权声明：本文为CSDN博主「IT老兵驿站」的原创文章，遵循 CC 4.0 BY-SA 版权协议，转载请附上原文出处链接及本声明。
原文链接：https://blog.csdn.net/chaiyu2002/article/details/82120256