On Tue, Jul 23, 2013 at 5:26 PM, Philip Oakley <philipoakley@xxxxxxx> wrote: > From: "Junio C Hamano" <gitster@xxxxxxxxx> > Sent: Tuesday, July 23, 2013 7:26 PM >> Jakub Narebski <jnareb@xxxxxxxxx> 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] -- 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