Get the difference between two branches in Git

Question

I did following (I simplified this comparing to a reality):

• created a branch Branch1, switched to it
• added file File1

Answer 1

Let's assume that you started on the branch master. Then you can do:

git diff master Branch1 > ../patchfile
git checkout Branch2    
git apply ../patchfile

Alternatively, if your goal is to rewrite history, then you could use an interactive rebase to squash commits.