Commits¶

Show commit summary:

git show --stat

Stage non-whitespace changes (ref):

git diff -U0 -w --no-color | git apply --cached --ignore-whitespace --unidiff-zero -

List files in change:

git show --name-only --pretty=format:

List merge conflicts¶

git diff --name-only --diff-filter=U