added git commit --amend alias
Merge branch 'master' into laptop