On Tue, Apr 17, 2018 at 8:17 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Eric Sunshine <sunshine@xxxxxxxxxxxxxx> writes: >> Makes sense. A possible rewrite (of the entire commit message): >> >> worktree: remove: recognize -f as short for --force >> >> Many commands support a --force option, frequently abbreviated as >> -f, however, "git worktree remove"'s hand-rolled OPT_BOOL forgets >> to recognize the short form, despite git-worktree.txt documenting >> -f as supported. Replace OPT_BOOL with OPT__FORCE, which provides >> -f for free, and makes 'remove' consistent with 'add' option >> parsing (which also specifies the PARSE_OPT_NOCOMPLETE flag). >> > Looks better. I am not sure if s/--force/-f/ in the synopsis > section is warranted, but '-f' is commonly understood as '--force' > (and that is the point of this patch after all), so it is probably > an improvement to be briefer. I meant to mention the synopsis change in the rewritten commit message. The s/--force/-f/ for 'remove' makes it consistent with the how it's shown for 'add' in the synopsis. (Changing it the other way, so 'add' shows --force would also work.)
