Carl Worth <cworth@xxxxxxxxxx> wrote: > Plus, when I'm teaching "fetch everything first, then manipulate it > locally", (which is what I teach, since that's the only way I use > git), then the "." looks really out of place when I teach the 'merge' > command. I end up saying, "Oh, that's there because you could do the > fetch and merge all in one step if you really wanted, but I never do > that.". > > And that's because I _do_ teach fetch first, as you've suggested. Ditto. In every way. I've taught the same fetch first, then merge strategy. Nobody I know in meat-space pulls from a remote URL and merges in one shot; they always fetch locally, look at the incoming changes, decide if its worthwhile/ok, *then* merge with "git pull . branch". The "." looks out of place for everyone... -- Shawn. - 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