top | item 47089948

(no title)

MathiasPius | 10 days ago

You can pull another branch without switching first:

  git switch my-test-branch
  ...
  git pull origin main:main
  git rebase main

discuss

order

hiccuphippo|9 days ago

You can also rebase directly on the remote branch

    git fetch
    git rebase origin/main

1718627440|8 days 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

?

WickyNilliams|9 days ago

Nice. That'll make things a bit smoother. Changing branches often trips me up when I would later `git switch -`.

mroche|9 days ago

Likewise with the other way around, just switch pull with push.

huntervang|9 days ago

I have always done `git pull origin main -r`