On Thu, Jul 13, 2017 at 8:53 AM, Jeff King <peff@xxxxxxxx> wrote: > So I'd say this is not really force-with-lease at all, but rather a > special mode that is somewhere between a normal fast-forward and a true > force-with-lease. I don't know if it would make sense to give it a > different name, or just lump it under force-with-lease. Yes. I think these are separate problems that needs separate mechanisms to solve, and I agree with you that it is also a separate issue if a single UI "safer non-ff push" that covers both (and other problems that will be discovered later) problems is desired or if a separate options (e.g. "--force=lease=...,reflog=...," with nicer names and syntax) is better.
