Re: [1.8.0] (v2) default "git merge" without argument to "git merge @{u}"
From: Scott Chacon <hidden>
Date: 2016-06-15 22:50:29
Hey, On Mon, Jan 31, 2011 at 2:55 PM, Jeff King [off-list ref] wrote:
On Mon, Jan 31, 2011 at 12:50:30PM -0800, Junio C Hamano wrote:quoted
Perhaps I should start a new directory in todo branch (say, 1.8.0), accept patches from people? I'd grudgingly admit that using Wiki on k.org may be less burdensome (I hate editing inside the browser myself), but I'd want to keep the mailing list the center of discussion and am afraid that forcing people to go to Wiki would fragment the discussion.I really wish we had a git-backed wiki. I also hate using the browser for such things (though browser extensions to edit textareas in a Real Editor at least make it tolerable, it still ends up clunky). GitHub's wiki gets this right. I'm not saying we should host our wiki there (well, it _would_ make setting it up pretty damn easy). But their wiki system (gollum) is open-source, albeit in ruby. And surely there are other git-backed alternatives (it's been a while since I've looked).
If you want to use the wiki on the git/git repo on GitHub that is being mirrored from the canonical repository, I've added Junio and peff to the account. If you want to use that wiki, anyone with a github account can edit wiki pages on the site or clone and edit it locally and push changes up. You can also turn off site edits so people have to send Junio a patch instead. It's up to you guys, but the access is there now if you want. Scott