add 'update' alias to pull origin/
add git up alias
add 'git parents' alias
Merge branch 'master' into linux