In git resources, added Steve Chacon's excellent Pro Git
merge git resource