From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 03 Feb 2009 09:22:05 GMT
Subject: Re: [PATCH] Switch receive.denyCurrentBranch to "refuse"
Message-ID: <7v4ozbdgea.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <20090203080734.GA27251@sigill.intra.peff.net>

Jeff King <peff@peff.net> writes:

> On Tue, Feb 03, 2009 at 12:01:43AM -0800, Junio C Hamano wrote:
>
>>  	"To allow pushing into the current branch, you can set it to 'ignore';",
>> -	"but this is not recommended unless you really know what you are doing.",
>> +	"but this is not recommended unless you arranged its work tree to get",
>> +	"updated to match what you pushed in some other way.",
>
> This is much better, but I believe it needs to be "...arranged _for_
> its work tree to get updated..." to be grammatically correct.
>
> And as a nit (which I seem to be full of tonight), you can get rid of
> the passive voice by saying:
>
>  but this is not recommended unless you arranged to update its work
>  tree to match what you pushed in some other way.
>
> which is slightly more clear, IMHO.

Much more clear.  I overuse the passive voice, I know it is a bad habit I
somehow cannot shake off.

Thanks.