At me, git pull at default will take ff-only(nothing in config at pull.rebase or pull.ff):
Remote: A -- B
Local: A
=> Local: A -- B

Remote: A -- B
Local: A -- C
--rebase:
=> Local: A -- B -- C
--no-rebase:
=> Local: A -- C -- B