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.4 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,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 6E7A01F524 for ; Fri, 30 Sep 2022 18:12:14 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="MBfYFuqK"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232133AbiI3SMH (ORCPT ); Fri, 30 Sep 2022 14:12:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34006 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232024AbiI3SLH (ORCPT ); Fri, 30 Sep 2022 14:11:07 -0400 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7432E5E54D for ; Fri, 30 Sep 2022 11:09:54 -0700 (PDT) Received: by mail-wr1-x42c.google.com with SMTP id f11so5354810wrm.6 for ; Fri, 30 Sep 2022 11:09:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=i210SOhaDvWGHMShiJSBmj6ZM/qSrNmLAX5e/fE427k=; b=MBfYFuqK2KgjciBqWwrx4i1y+4cTZnRzthx3B1QMOMmrZI8Gw0SYccjaIJHF1L/P6s M39w47oyEA93E4BAUgAJq3/aAqYcxyCijaukHHkcSfy3pzAWCmmpsC/pxG6LyziE3u6L gWEnP5lOY/AFN5ig2My/8fI1NkGgwPBQWpUCMowk2FmvmajfWP1X9tZi2b1RHay2f8Ox PRGmwgwaaydN9R4GRfmZ2r7sFe7qstR2XuLH/aEsKo8H74p3RpL2QGgchSKa87Lhy/V5 tqtRkRkLhuNdzVWzQPTGPjH/lWbEG9FM268Es8tLFgqn7QGxhA8mZUCVaQQ3R6ZKuWm1 RTjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=i210SOhaDvWGHMShiJSBmj6ZM/qSrNmLAX5e/fE427k=; b=vf/92xCykEp83PV52kALcABTRxLUvTQ4G6/PTgeiVskpEE3ScgyL5DoW8r5qCKK6ma +xSoepc9/mzjChBTaIpzlqG6nf+5HV436F74YCtZaBddUw2/D3fQZ0GGTLDbYYsoDj44 AreAyH19ZaO1XTnug+4au1szlVaTp60q8e4fdxJYpkZ1nnbWe9dC46j3l9zqGTyPyGCO ZJwZZwTb1IionpdafSm9pUBnoIxED5lnXB4sVJWZljEVnAhOJY/JPtnhSi1HLIa9z8JD JFHbAGA2i62XSHCzEmd/i1olrxC///+8aN3Ij7AK+WYnwbvGcEtIsqnmp99WKPQgrghQ +p1Q== X-Gm-Message-State: ACrzQf0I+GgZlcAlqTm1VBBSCKpFL1VFlz88JlsAAWtLl55Tso0FSkrJ li9Z+9OL13/heuCNFhxvcwQGG6iPyhN7Rg== X-Google-Smtp-Source: AMsMyM7Zmiwx1CHezPOeJ5QZi3MMzf0uWBGj3lQs4BvaBB63rHcvbbrirMZHvCcYy9mo2ZNCbLFPOg== X-Received: by 2002:a5d:5a9e:0:b0:22a:498d:d2fd with SMTP id bp30-20020a5d5a9e000000b0022a498dd2fdmr6666372wrb.390.1664561392371; Fri, 30 Sep 2022 11:09:52 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id h9-20020a1c2109000000b003b4fac020c8sm7102703wmh.16.2022.09.30.11.09.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Sep 2022 11:09:51 -0700 (PDT) From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= To: git@vger.kernel.org Cc: Junio C Hamano , Victoria Dye , Taylor Blau , Emily Shaffer , Jonathan Nieder , John Cai , Eric Sunshine , =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Subject: [PATCH v3 31/36] doc txt & -h consistency: make "commit" consistent Date: Fri, 30 Sep 2022 20:07:54 +0200 Message-Id: X-Mailer: git-send-email 2.38.0.rc2.935.g6b421ae1592 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Make the "-h" output of "git commit" consistent with the *.txt version by exhaustively listing the options that it takes. Signed-off-by: Ævar Arnfjörð Bjarmason --- builtin/commit.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/builtin/commit.c b/builtin/commit.c index 21ad4ccbf87..64f420bcbf6 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -40,7 +40,14 @@ #include "pretty.h" static const char * const builtin_commit_usage[] = { - N_("git commit [] [--] ..."), + N_("git commit [-a | --interactive | --patch] [-s] [-v] [-u] [--amend]\n" + " [--dry-run] [(-c | -C | --squash) | --fixup [(amend|reword):])]\n" + " [-F | -m ] [--reset-author] [--allow-empty]\n" + " [--allow-empty-message] [--no-verify] [-e] [--author=]\n" + " [--date=] [--cleanup=] [--[no-]status]\n" + " [-i | -o] [--pathspec-from-file= [--pathspec-file-nul]]\n" + " [(--trailer [(=|:)])...] [-S[]]\n" + " [--] [...]"), NULL }; -- 2.38.0.rc2.935.g6b421ae1592