GIT diff branches, apply diff

git diff up-to-date-branch old-branch > code.diff
git apply code.diff