Jeff King <peff@xxxxxxxx> writes: > On Fri, Jan 26, 2007 at 04:03:27PM -0800, Junio C Hamano wrote: > >> Probably you are using v1.4.4.X. >> >> The change to make git-merge accessible as the first level UI >> happened during the preparation for the upcoming v1.5.0, and is >> available only in v1.5.0-rc0 and newer versions (the latest is >> at v1.5.0-rc2). You are right -- as you and other people noticed, this is primarily my fault. > This highlights a problem with the current web pages. The documentation > at http://www.kernel.org/pub/software/scm/git/docs/ is for the current > master (which is presumably where this user got the tutorial mentioning > 'git merge' as porcelain). But I suspect a lot of people will be using > the latest released version (either from the tarball, or a binary > package). We could: > 1. Only re-publish the web doc at time of release > 2. Build the published web doc from 'maint' instead of master > 3. Publish (and clearly mark) both last-released and master doc > 4. Disregard it; this particular release made a lot of UI changes, but > we're not likely run into this for most releases. The ideal solution would be 3 but it would require some juggling to arrange git.txt -> index.html generation that happens every time I push to kernel.org machine, so give me a bit of time and I'll come up with something. - 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