On Sat, 14 Feb 2009 22:58:33 -0500 "Stephen C. Gilardi" <squee...@mac.com> wrote:
> > On Feb 14, 2009, at 10:44 PM, Kyle Schaffrick wrote: > > > Hmm, forgive a possibly stupid question: Do you not also need to do > > a "git update" to update your working copy to the new head revision? > > > > I don't know git that well, but it seems like many DVCSs like > > mercurial > > distinguish between "pull" and "update". > > I haven't worked with mercurial. > > In git, "pull" is a command that combines "fetch" and "merge". There > is no "git update". > > http://git.or.cz/gitwiki/GitDocumentation > > --Steve > Doh! Sorry, I mix them up easily. I tend to reach for hg for my own code, but am getting acquainted with git for others' projects. They just have to overload words differently, don't they! Confusingly: git fetch = hg pull git pull = hg pull -u git merge = hg update (in "fast-forward" case); hg merge (otherwise) R'ing-T-F-M next time, -Kyle --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Clojure" group. To post to this group, send email to clojure@googlegroups.com To unsubscribe from this group, send email to clojure+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/clojure?hl=en -~----------~----~----~----~------~----~------~--~---
