git upstream question