git rebase

git rebase (doc) reapply commits on top of another base tip.

git rebase --interactive / git rebase -i

git rebase origin/main

git rebase --continue

• git config pull.rebase false # merge (the default strategy)
• git config pull.rebase true # rebase

Errors

• Fatal: Need to specify how to reconcile divergent branches.

Related

• crane rebase
• git merge
• git reset --soft

See also

• git rebase, git rebase --interactive
• git config, .git/config, ~/.gitconfig, --list, --global, Usage: git config, credential.helper, --get, Configure git, pull.rebase