fix: simplify custom commit diff
Merge branch 'master' into cr-separateGitHelpers