3 ms·
"git rebase" has --preserve-merges (apparently renamed to --rebase-merges a few years ago) to recreate those local merge commits, maybe it can be set somehow fo
by Izkata 6y ago
"git rebase" has --preserve-merges (apparently renamed to --rebase-merges a few years ago) to recreate those local merge commits, maybe it can be set somehow for this as well?
- jgmarcel 6y agoExactly. That’s the default I use. You can set it via: git config --global pull.rebase merges