gistfile1.rb

branch = "acme"
# Make a patch file for each branch

.git checkout #{branch}
.git checkout master
.git diff --binary master #{branch} > #{branch}.patch

# Make a new branch
.git branch -D #{branch}
.git checkout -b #{branch}

# Apply the patch
.git apply #{branch}.patch

.git add app*

.git add lib*

.git commit -am "Re-applying all changes to previous branch so we can rebase on master in the future"

.git push --force origin #{branch}