Git config: Only merge explicitly when pulling