git diff with master code example

Example 1: git check diff against master

git diff master...branch

Example 2: git diff two commits one file

$ git diff HEAD^^ HEAD main.c
$ # show diff between HEAD(current commit) and HEAD^^(two commits back) for main.c

Example 3: make diff git as commit

A simple way to do it is:

create and checkout branch tmp at branch_a (git branch tmp branch_a && git checkout tmp)
git reset --soft branch_b
git commit
that commit must have all the diff