Rerere
Merge branch 'master' of github.com:githubteacher/git-advanced