On Thu, Aug 30, 2018 at 3:40 AM Jeff King <[email protected]> wrote: > On Tue, Aug 28, 2018 at 05:20:25PM -0400, Eric Sunshine wrote: > > - N_("force removing even if the worktree is dirty"), > > + N_("force removal even if worktree is dirty or > > locked"), > > I wonder if somebody might assume from this that a single "-f" would > override a lock. Perhaps not the end of the world, and the manpage does > make it clear. And also I don't really know how to be more specific here > without an overly long line.
Precisely, on all counts. Plus, if they try a single --force and it fails, the hint printed when it fails says explicitly to use --force twice, so the "solution" is easily discoverable. > I'm guessing all those thoughts went through your head before ending up > here, too. :) You guess correctly and you came to the same conclusion as I did. These -h summary lines are just to short for any real discussion.
