commit 2.2
Merge branch 'master' of https://github.com/aorenge/git-pull-rebase-2