Update git branches from master

Question

Hi guys!

I'm kinda new to git and now I'm in this situation:

• i have like four branches (master, b1,b2,b3)
• after i worked on b1-b3, i realized i have something to change on branch master that should be in all other branches
• i changed what i needed in master and... here is my problem:

how do i update all other branches with master branch code?

Give me an idea, something, because I don't even know what should I search for.

Thanks!

Ok, me stupid:

http://progit.org/book/ch3-6.html

git rebase master

was THAT easy!

Answer 1

checkout each branch

git checkout b1

then merge

git merge origin/master

then push

git push origin master

Answer 2

You can merge, or you can apply individual commits across branches by using git cherry-pick.