Understanding Git Pull: fetch, merge, rebase and Divergent Branches
We see with real output that git pull is fetch plus merge or rebase, the "divergent branches" error on diverged branches since Git 2.33.1, the --no-rebase, --rebase and --ff-only options, the choice between pull.rebase and pull.ff, pull.autostash from Git 2.51 and fetch --prune.
6 Nov 2026
·
9 min
·
2
