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 falseRelated terms
- git pull — The command that fetches from the upstream remote and then merges (or, if configured, rebases) the new commits into your current branch.
- merge — Combining the work of two branches into one, either by moving a branch forward (a fast-forward) or by recording a merge commit.
- rebase — Moving a series of commits so they start from a different commit, by replaying each one as a new commit with a new ID.
Taught in
- Installing Git, And Telling It Who You Are — Advanced Git Internals & Distributed Workflows