git 打补丁

git format-patch origin/master

合补丁

patch -p1 < 0001-kernel-modification-for-camera-factory-mode.patch

git 比较分支

git show -branch 

git diff branch1 branch 2

git 合并分支

git checkout branch1

git pull branch2

或者 git merge HEAD branch2

简写为 

git checkout branch1

git merge branch2