Adding
`branch.autosetuprebase = always`
Merge remote-tracking branch 'vcsh-git/master'