update commit after pull
refactor exception
Merge branch 'dev'
make git diff the default action of commit list
Merge branch 'dev'