如何将所有分支与主分支合并？

Question

I have a few branches locally and want to update them. How to merge the stuff from master branch into all other branches?

Answer 1

#!/bin/bash

git checkout master
git pull

branches=()
eval "$(git for-each-ref --shell --format='branches+=(%(refname))' refs/heads/)"

for branch in "${branches[@]}"; do
   branch=`expr substr $branch 12 100`
   git checkout $branch
   git merge master
done

git checkout master

Answer 2

Assuming that you branched off of master:

git checkout my_branch
git rebase master