pull.rebase

The setting that decides whether git pull joins incoming work with a merge (false) or by rebasing your commits on top (true).

In more detail

Recent Git versions ask you to choose when a pull cannot fast-forward. false keeps the traditional behaviour of a merge; true replays your local commits after the fetched ones instead.

Example

git config --global pull.rebase false

Related terms

Taught in

References