git diff branch_1…branch_2
git checkout branch_name ./src/…/file1 ./src/…/file2 ./src/…/file3
git commit --amend
Git Sophisticated Commands
原文:http://www.cnblogs.com/kid551/p/4846457.html