git diff 换行

git --no-pager diff

or

git diff --color | less -R

显示改动过的文件

git diff --staged --name-only  | cat

比较 feature 分支和 master 分支具体一个文件的变动

git diff feature/sftp-server master -- .gitlab-ci.yml

https://stackoverflow.com/questions/4099742/how-to-compare-files-from-two-different-branches