{"thread":{"id":"15681","subject":"No \"pull\" in git gui?","startedAt":"2008-09-26T14:37:57Z","lastAt":"2008-09-26T14:49:55Z","messageCount":3,"participants":["Steve Hoelzer","Andreas Ericsson","Shawn O. Pearce"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"91688","messageId":"588192970809260737i46ce0c30y191e29156bbf6396@mail.gmail.com","threadId":"15681","inReplyTo":null,"subject":"No \"pull\" in git gui?","fromName":"Steve Hoelzer","fromEmail":"shoelzer@gmail.com","sentAt":"2008-09-26T14:37:57Z","receivedAt":"2008-09-26T14:37:57Z","isPatch":false,"sender":{"key":"shoelzer@gmail.com","avatar":"https://avatars.githubusercontent.com/u/4623209?v=4"},"body":"Why isn't there a pull command in git gui's remote menu? Am I supposed\nto fetch and then merge? Is that preferred over pull for some reason?\n\nSteve\n"},{"id":"91690","messageId":"48DCF5F5.3040409@op5.se","threadId":"15681","inReplyTo":"588192970809260737i46ce0c30y191e29156bbf6396@mail.gmail.com","subject":"Re: No \"pull\" in git gui?","fromName":"Andreas Ericsson","fromEmail":"ae@op5.se","sentAt":"2008-09-26T14:47:17Z","receivedAt":"2008-09-26T14:47:17Z","isPatch":false,"sender":{"key":"ae@op5.se","avatar":"https://gravatar.com/avatar/426e89595c75a8f5252dd0c989e5fabe5bcac616e68557427ad9aef6b0ca342a?d=mp&s=160"},"body":"Steve Hoelzer wrote:\n> Why isn't there a pull command in git gui's remote menu? Am I supposed\n> to fetch and then merge? Is that preferred over pull for some reason?\n> \n\nYes, it is. Blind \"git pull\" without knowing what you're going to\nfetch is not recommended, because it tends to create tons and tons\nof \"useless\" merges, where all commits are on one branch and there's\nno clear distinction between them. Such merges are useless because\nyou'd be better off with a linearized history (bisection turns out\nslightly easier, fe).\n\n\"git pull\" is primarily intended for\n* people like Linus, who merge in a lot of other people's code.\n* bleeding-edge *users* that just want the latest and greatest.\n* \"vcs = cvs\" users, that never care about history\n\nFor all other workflows I've ever encountered, doing \"git pull\"\nblindly always ends up being worse than\n* developing on topic-branches and merging those when ready.\n* doing 'git pull --rebase', to linearize a series of small\n  fixes before pushing them back up.\n* 'git fetch' + manually inspect new code + 'git merge'.\n\n-- \nAndreas Ericsson                   andreas.ericsson@op5.se\nOP5 AB                             www.op5.se\nTel: +46 8-230225                  Fax: +46 8-230231\n"},{"id":"91691","messageId":"20080926144955.GB3669@spearce.org","threadId":"15681","inReplyTo":"588192970809260737i46ce0c30y191e29156bbf6396@mail.gmail.com","subject":"Re: No \"pull\" in git gui?","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2008-09-26T14:49:55Z","receivedAt":"2008-09-26T14:49:55Z","isPatch":false,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Steve Hoelzer <shoelzer@gmail.com> wrote:\n> Why isn't there a pull command in git gui's remote menu?\n\nI got lazy and didn't write support for it.  Before today nobody has\nreally asked me why it was missing so it seemed to be unimportant.\n\n> Am I supposed to fetch and then merge?\n\nYes, that works.\n\n> Is that preferred over pull for some reason?\n\nI find it easier to teach new Git users \"fetch + merge\" rather\nthan pull.  It helps to reinforce the idea of having your own\nlocal state that differs from the state on the upstream repository.\nI consider pull to be more of a power-user feature.  But many in the\nGit community disagree with me and find teaching pull is easier, with\nfetch+merge being power user features.\n\nSo patches to add pull to git-gui would be accepted, but they won't\nbe getting written by me anytime soon.  I've got too much other\nstuff going on to write a feature that isn't very interesting to me.\n\n-- \nShawn.\n"}]}