add new options gitSupportsNoEdit
Merge branch 'hotfix/0.13.6'