From: Eric Sunshine <sunshine@sunshineco.com>
Date: Tue, 23 Jul 2013 23:18:49 GMT
Subject: Re: [PATCH v3 0/6]
Message-ID: <CAPig+cRfPeHZ-rmOzRTqdw7QkJKf4e2CxMr4-zDvekxH=ROBew@mail.gmail.com>
In-Reply-To: <68F84DC48FCA4226A8F3C00AC42A9598@PhilipOakley>

On Tue, Jul 23, 2013 at 5:26 PM, Philip Oakley <philipoakley@iee.org> wrote:
> From: "Junio C Hamano" <gitster@pobox.com>
> Sent: Tuesday, July 23, 2013 7:26 PM
>> Jakub Narebski <jnareb@gmail.com> writes:
>>> Junio C Hamano <gitster <at> pobox.com> writes:
>>>> This is mostly unchanged since the previous round, except that
>>>>
>>>>  * The option is spelled "--force-with-lease=<ref>:<expect>".
>>>>    Nobody liked "cas" as it was too technical, many disliked
>>>>    "lockref" because "lock" sounded as if push by others were
>>>>    excluded by it while in fact this is to fail us.
>>>
>>> Perhaps "--force-gently" ? :-)
>
> Or "--force-carefully" to better indicate the safety / care that is being
> applied?

[bike-shedding: on]

--force-if-safe

[bike-shedding: off]