当其他分支签出时，Git获取/重新设置主分支

Question

Currently when I'm working on my local feature branch in order to get latest changes I need to do the following:

git checkout master
git fetch
git rebase
git checkout my-feature
git rebase master

Is there a simplier solution to just pull changes to master branch without switching to it?

Answer 1

I think Git will always switch to master behind the scene, to perform the rebase (considering that rebase starts by a checkout of the destination branch:
see " git rebase , keeping track of ' local ' and ' remote ' ").

You just can use the shortcut git pull --rebase :

git pull --rebase master:master
git checkout my-feature
git rebase master

Answer 2

I think you can just do a git fetch followed by a git rebase origin/master That should rebase your topic-branch against master. Don't know if the fetch is really necessary though.