Autosetup merge, tip from http://gitready.com/beginner/2009/03/09/remote-tracking-branches.html