using no-ff for git default
Merge branch 'master' into deepin