Felipe Contreras <felipe.contreras@xxxxxxxxx> writes: > On Tue, May 21, 2013 at 6:24 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: >> Felipe Contreras <felipe.contreras@xxxxxxxxx> writes: >> >>> I still haven't received a response: which makes more sense? >>> >>> a) >>> >>> % git checkout svn-ext >>> % git fetch >>> From . >>> * branch master -> FETCH_HEAD >>> # oops >>> % git fetch git-svn >>> % git log ..FETCH_HEAD >>> % git merge FETCH_HEAD >>> >>> b) >>> >>> % git checkout svn-ext >>> % git fetch >>> From git://git.kernel.org/pub/scm/git/git >>> 680ed3e..de3a5c6 master -> origin/master >>> # oops >>> % git fetch svn-ext >>> % git log ..FETCH_HEAD >>> % git merge FETCH_HEAD >> >> I think with the scenario you are following, a) would prepare the >> FETCH_HEAD with her local git-svn branch which is her svn-ext topic >> is based on, but you illustrated it to fetch 'master', which I think >> is a minor typo. >> >> Modulo that typo, the step before the #oops makes perfect sense. It >> fetched where she told Git her work on svn-ext is based on. >> >> But the step after that does not make much sense in that flow. > > You don't get to decide what Sally (I'm naming her) does, all you get > to decide is what Git does. > > Sally wants to fetch from the true upstream: svn-ext, but in the > process does by mistake a 'git fetch' *without arguments* (WHICH IS > WHAT THIS WHOLE DISCUSSION IS ABOUT). So now is the time you answer: > a) or b). Heh, that was my example. In any case, my pick is still a). She *TOLD* Git that her local git-svn branch is what forms the base of her local svn-ext work. I won't even read the remainder. You are not even worth wasting time on discussing this. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html