From: Thomas Adam <thomas@xteddy.org>
Date: Tue, 01 Feb 2011 00:01:10 GMT
Subject: Re: [1.8.0] (v2) default "git merge" without argument to "git merge @{u}"
Message-ID: <AANLkTi=EX08rAucRm7uVCTLUgjOi+skoEF1rEhpHVMsi@mail.gmail.com>
In-Reply-To: <20110131225529.GC14419@sigill.intra.peff.net>

On 31 January 2011 22:55, Jeff King <peff@peff.net> wrote:
> On Mon, Jan 31, 2011 at 12:50:30PM -0800, Junio C Hamano wrote:
>
>> 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).

You mean like ikiwiki (were it used on the main sites)?

http://ikiwiki.info

-- Thomas Adam