4 ms·
You can also rebase directly on the remote branch git fetch git rebase origin/main
by hiccuphippo 8mo ago
You can also rebase directly on the remote branch
git fetch
git rebase origin/main
- 1718627440 8mo ago> git rebase origin/main When is that command actually useful? When you want to rebase it is likely because your local and the upstream branch have diverged, so this would just result in weird conflicts, because origin/main is no longer an ancestor to main. Wouldn't you want to use something like: git rebase $(git merge-base main origin/main) main --onto=origin/main or git rebase origin/main@{1} main --onto=origin/main ?