editing the proposed git convention
Merge branch 'docs/git' into docs/master