Fix pulling from rebased upstreams with git