Hi, On Sun, 12 Oct 2008, Shawn O. Pearce wrote: > Junio C Hamano <gitster@xxxxxxxxx> wrote: > > Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes: > > > > > Some confusing tutorials suggest that it would be a good idea to call > > > something like this: > > > > > > git pull origin master:master > > > > > > While it might make sense to store what you want to merge, it typically > > > is plain wrong. > > > > I am somewhat confused. > > The description is confusing, yes. It should be about git fetch, > not git pull. However, it was a "git pull origin master:master" that was the issue. That's why I wrote it in the commit message. > > This "confusion" has been there for very long time and (at least the > > scripted version of) git-pull/git-fetch pair has supported a > > workaround in the form of --update-head-ok option. Good point. I completely had forgotten about that feature. > I think "git fetch url side:master" when master is the current branch > and we have omitted --update-head-ok is broken. Specifically Dscho's > last hunk which adds this test. The test fails on current master. Thanks for testing; I ran out of my Git time budget yesterday. Will send an updated patch as a reply to Daniel's reply. Ciao, Dscho -- 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
