git pull

git pull is commonly understood as fetch followed by integration. Depending on configuration, the integration can be a merge or a rebase. Because it combines multiple operations, understanding fetch separately is important when precise control is needed.

Pull With Explicit Strategy
git pull --ff-only
git pull --rebase
git fetch origin
git merge origin/main
💡 --ff-only refuses non-fast-forward integration, while --rebase rebases local commits on top of fetched changes. Fetch plus merge makes the individual steps explicit.
Key Takeaways
  • git pull performs fetching and integration.
  • Pull behavior can be configured or specified explicitly.
  • Use git fetch when you want to inspect changes before integrating.
Knowledge Check

Why might a developer prefer `git fetch` followed by an explicit merge?