Rebase and preserve local merge structure.
Section: Pull, Push, and Merge Policy
Rebase merges on pull
bash
bash
git config --global pull.rebase mergesLearn the surrounding workflow
Compare similar commands or jump into common fixes when this command is part of a bigger troubleshooting path.
Related commands
Same sheet · prioritizing Pull, Push, and Merge Policy
Enable auto-stash on rebase
Temporarily stash dirty worktree during rebase.
Use simple push default
Push current branch to its upstream when names match.
Auto setup remote on first push
Set upstream automatically for first push.