From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS3215 2.6.0.0/16 X-Spam-Status: No, score=-3.7 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by dcvr.yhbt.net (Postfix) with ESMTP id DCE831F51E for ; Mon, 3 Oct 2022 09:12:34 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="PtjPeMsz"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231450AbiJCJMa (ORCPT ); Mon, 3 Oct 2022 05:12:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51166 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231481AbiJCJMH (ORCPT ); Mon, 3 Oct 2022 05:12:07 -0400 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D590B29811 for ; Mon, 3 Oct 2022 02:09:59 -0700 (PDT) Received: by mail-ej1-x629.google.com with SMTP id kg6so5380852ejc.9 for ; Mon, 03 Oct 2022 02:09:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:in-reply-to :user-agent:references:date:subject:cc:to:from:from:to:cc:subject :date; bh=VldTSlCN+igckWadjJxiW+TTeQgYmMSrQs2hOS9WHP4=; b=PtjPeMszNO4YOloMgvSigUw9UXy5LUF1PAgp/FP+Og+1mJBr1Sft9utvMpoet0lzeK BUgJheFzQHd44S/HrtKEAiae4nVTKcxOfb3dhADVxxAcbuGmn0zBDtOtk+gVrvZL10/a 69Eshvki9Y2nngEmPe9qZFYlxiwzSxsC0Q98aJBH+TGTI/VkVAIs7CUnCqqfesa6w20m iYZAjiKBbv5hjQBvvKIKOmmfz8lbBwY8u1ATagCW1r0jQf4ewD+Ywi98u9GRAeZ3x9mW qIwlINzBpZ9y0D3UhNkNMjHa1iz5jP2MoYpZ42VNLnlQn+fGC7WTKUCALDlF1+JLwJQZ RTIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:in-reply-to :user-agent:references:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date; bh=VldTSlCN+igckWadjJxiW+TTeQgYmMSrQs2hOS9WHP4=; b=WxMqwPA+tCB7v49SgYIqkdibMFBKpTmBVL89ohbERDIl6N3KE3Mx9O5CxYktWagx5/ sKimowMzzI6DsSUkh7zMfL+iGjWEBP6n/GMupzXT3GLPbSfDbQw0y5V6Yj26aFZoxIXM laKWxu1KtuRkc0gSSYrL1i+2Lm1oZGC/x57KBYYuHTrojGw7LTDZJ/0ffbB+u9Tmfcy+ kYS+/Hocku0vtOX+W4DROume4SbtRnPLg8z+PaD39zn2/85d+EMK3RXl5Z6G1wyCuFq3 hWfgAAPYIbwl505BIGZoCNXcamXE3MQkwAU/ghTJeb1yoFqt2GkPwlXpZ5gx9V77eSOP gM0w== X-Gm-Message-State: ACrzQf0pnSSAIpXETb7aIdMzlMcEj1xWeM+/ZTbSII2+XjccSfcdbuyC YQQvvVoZzEK6avgXynYn9Mw= X-Google-Smtp-Source: AMsMyM5oPtRvpagJ+LiZwLxOJPdCsgXCpZUoEtExMPUo5IEcDk00EINJkdLBJWVNcaB7Vt94cADFZA== X-Received: by 2002:a17:907:31c1:b0:742:28a3:5d08 with SMTP id xf1-20020a17090731c100b0074228a35d08mr14365502ejb.112.1664788185966; Mon, 03 Oct 2022 02:09:45 -0700 (PDT) Received: from gmgdl (dhcp-077-248-183-071.chello.nl. [77.248.183.71]) by smtp.gmail.com with ESMTPSA id f12-20020a17090631cc00b007806c1474e1sm5047025ejf.127.2022.10.03.02.09.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Oct 2022 02:09:45 -0700 (PDT) Received: from avar by gmgdl with local (Exim 4.96) (envelope-from ) id 1ofHSJ-0020XA-39; Mon, 03 Oct 2022 11:09:43 +0200 From: =?utf-8?B?w4Z2YXIgQXJuZmrDtnLDsA==?= Bjarmason To: Junio C Hamano Cc: git@vger.kernel.org, Victoria Dye , Taylor Blau , Emily Shaffer , Jonathan Nieder , John Cai , Eric Sunshine Subject: Re: [PATCH v3 22/36] doc txt & -h consistency: make "rerere" consistent Date: Mon, 03 Oct 2022 11:00:28 +0200 References: User-agent: Debian GNU/Linux bookworm/sid; Emacs 27.1; mu4e 1.9.0 In-reply-to: Message-ID: <221003.86sfk5tgrs.gmgdl@evledraar.gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Sat, Oct 01 2022, Junio C Hamano wrote: > =C3=86var Arnfj=C3=B6r=C3=B0 Bjarmason writes: > >> For "rerere" say "pathspec" consistently, and list the subcommands in >> the order that they're discussed in the "COMMANDS" section of the >> documentation. > > pathspec refers to the entire set of patterns, which consists of one > or more "pathspec element"s, so there is no need for "..." there. Maybe I'm misreading this, but are you suggesting that whenever "" appears in the text the user should understand it as "...", i.e. as is the case with the special-case that is "". I'm not opposet do that, but I really wish we could avoid further special-cases, there's no current user of "" (with an "s" for plural. If you're saying that "" now should be interpretet like that then surely e.g.: Documentation/git-clone.txt:--recurse-submodules[=3D]:: Should be read as supporting: --recurse-submodules some/path some-other-path We could say that using it in that option context is a further special-case, but I think this way lies madness, it would mean that e.g.: git some-cmd [--option=3D] [-- ] would have "" mean different things in those two contexts. We also have various examples of "..." meaning what it means in the post-image here (including in one of the version of the "rerere" docs): Documentation/git-add.txt: [--] [...] Documentation/git-commit.txt: [--] [...] Documentation/git-reset.txt:'git reset' (--patch | -p) [] [--] [= ...] FWIW it should arguably be [...] here, but per 5d2c3b01604 (rerere forget: deprecate invocation without pathspec, 2011-03-01) it looks as though we want to advertise the other usage.