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 03CE71F522 for ; Wed, 28 Sep 2022 08:41:59 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="N0x7OCqm"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233591AbiI1Ik2 (ORCPT ); Wed, 28 Sep 2022 04:40:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51640 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230140AbiI1Ijt (ORCPT ); Wed, 28 Sep 2022 04:39:49 -0400 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 66138EA0 for ; Wed, 28 Sep 2022 01:39:47 -0700 (PDT) Received: by mail-wr1-x433.google.com with SMTP id r7so18658018wrm.2 for ; Wed, 28 Sep 2022 01:39:47 -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=FeYFSsgdnc+R0BfUQWCQf25p06Pg0NiBCMR8LBlD4i4=; b=N0x7OCqmxaDv5qWjIt6SiB5TBPR+j8ANSUxpO3YK6MYUEwntyniSgtJh+P/sAmUnTu 3LdPFUZMmqnhh9AbM+UdCBsnPh7zwFjpMSlBTNqAqDOgM95ibWEi60zAsN2Z5KJ0fLN0 DwujYGcmsh6st6R+g5WxXm6Lm2NVd3ScJfVBKbfeGNl+T499w6HQCG01wuVEUB0XZgeS bYM4XvzQD2+r/WKAf92CACX07riECw2Mj1yITCxpTnfuGdXujXTCoxTcs18jdcYuXAL6 U5EWFil6JN7S9RU2l8RP2Xfrl0VfbDsgjhWKfpvDmI76cM/Rmn8OylIUZHW6oyF780rl 0UnA== 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=FeYFSsgdnc+R0BfUQWCQf25p06Pg0NiBCMR8LBlD4i4=; b=k0gzLhAu13P5F0Ihdy1g4TPMI6zUEMmOtCxIfGNqxza9zTW1s4eU6olaGMNDZUJ/gY u0Ykrjv5JbMK9Ea8QPYNNmRZR8lSazB0pDDkm1PqSGLIvC/Jz4QQXhfTFqP1KQX8ubZa RyeDTO0pPcrHGtWlBFoJjHvKsq071pHiuXs9aveBRyG0HaC1x5T06zrXJ9pDLhE/+RR4 3KgqKhpjYiHlGHCqyCurnn/NKPabLSwatT8OQ74NRioeVrqUTdBOilqcCcRr7PhtbXkV YfojwV03UWwDlwT7OU8pbrM4Khk+RE60/a+cUn3Dp4n8Oyxbcs3jz30Hi9ZiHwC4tteX CVBg== X-Gm-Message-State: ACrzQf3+ABxkEMosn1UThNrMX5yum6fAOfVmIdjifCNy2C/BT9pqKex9 WaM46hLdbUlbKBrG3OybRSPwq+co/GQKBw== X-Google-Smtp-Source: AMsMyM5fDhbVTQKh/ok/Xa1UVZ2njXgmrUUwyiv0hhw6Wuc3a+4c0DORW+rSglJ9rqBm2kJI4Ed+rg== X-Received: by 2002:a05:6000:1378:b0:22c:c689:9edd with SMTP id q24-20020a056000137800b0022cc6899eddmr1925579wrz.49.1664354385318; Wed, 28 Sep 2022 01:39:45 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id 26-20020a05600c229a00b003b31fc77407sm1075026wmf.30.2022.09.28.01.39.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Sep 2022 01:39:44 -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 , =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Subject: [PATCH v2 09/35] doc txt & -h consistency: word-wrap Date: Wed, 28 Sep 2022 10:39:04 +0200 Message-Id: X-Mailer: git-send-email 2.38.0.rc1.925.gb61c5ccd7da 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 Change the documentation and -h output for those built-in commands where the *.txt and -h output didn't match as far as word-wrapping was concerned. Signed-off-by: Ævar Arnfjörð Bjarmason --- Documentation/git-hash-object.txt | 3 ++- Documentation/git-worktree.txt | 3 ++- builtin/bugreport.c | 3 ++- builtin/commit-graph.c | 8 ++++---- builtin/commit-tree.c | 4 ++-- builtin/diagnose.c | 3 ++- builtin/init-db.c | 3 ++- builtin/interpret-trailers.c | 4 +++- builtin/read-tree.c | 4 +++- builtin/show-branch.c | 3 ++- builtin/show-ref.c | 4 +++- 11 files changed, 27 insertions(+), 15 deletions(-) diff --git a/Documentation/git-hash-object.txt b/Documentation/git-hash-object.txt index df9e2c58bdb..58670ef12f7 100644 --- a/Documentation/git-hash-object.txt +++ b/Documentation/git-hash-object.txt @@ -9,7 +9,8 @@ git-hash-object - Compute object ID and optionally creates a blob from a file SYNOPSIS -------- [verse] -'git hash-object' [-t ] [-w] [--path=|--no-filters] [--stdin [--literally]] [--] ... +'git hash-object' [-t ] [-w] [--path=|--no-filters] + [--stdin [--literally]] [--] ... 'git hash-object' [-t ] [-w] --stdin-paths [--no-filters] DESCRIPTION diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt index ada30c86a7c..063d6eeb99d 100644 --- a/Documentation/git-worktree.txt +++ b/Documentation/git-worktree.txt @@ -9,7 +9,8 @@ git-worktree - Manage multiple working trees SYNOPSIS -------- [verse] -'git worktree add' [-f] [--detach] [--checkout] [--lock [--reason ]] [-b ] [] +'git worktree add' [-f] [--detach] [--checkout] [--lock [--reason ]] + [-b ] [] 'git worktree list' [-v | --porcelain [-z]] 'git worktree lock' [--reason ] 'git worktree move' diff --git a/builtin/bugreport.c b/builtin/bugreport.c index 530895be55f..faa268f3cfb 100644 --- a/builtin/bugreport.c +++ b/builtin/bugreport.c @@ -60,7 +60,8 @@ static void get_populated_hooks(struct strbuf *hook_info, int nongit) } static const char * const bugreport_usage[] = { - N_("git bugreport [-o|--output-directory ] [-s|--suffix ] [--diagnose[=]"), + N_("git bugreport [-o|--output-directory ] [-s|--suffix ]\n" + " [--diagnose[=]"), NULL }; diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c index 51557fe786e..cd346f95f08 100644 --- a/builtin/commit-graph.c +++ b/builtin/commit-graph.c @@ -13,10 +13,10 @@ N_("git commit-graph verify [--object-dir ] [--shallow] [--[no-]progress]") #define BUILTIN_COMMIT_GRAPH_WRITE_USAGE \ - N_("git commit-graph write [--object-dir ] [--append] " \ - "[--split[=]] [--reachable|--stdin-packs|--stdin-commits] " \ - "[--changed-paths] [--[no-]max-new-filters ] [--[no-]progress] " \ - "") + N_("git commit-graph write [--object-dir ] [--append]\n" \ + " [--split[=]] [--reachable|--stdin-packs|--stdin-commits]\n" \ + " [--changed-paths] [--[no-]max-new-filters ] [--[no-]progress]\n" \ + " ") static const char * builtin_commit_graph_verify_usage[] = { BUILTIN_COMMIT_GRAPH_VERIFY_USAGE, diff --git a/builtin/commit-tree.c b/builtin/commit-tree.c index 63ea3229333..e4b85d29d56 100644 --- a/builtin/commit-tree.c +++ b/builtin/commit-tree.c @@ -15,8 +15,8 @@ #include "parse-options.h" static const char * const commit_tree_usage[] = { - N_("git commit-tree [(-p )...] [-S[]] [(-m )...] " - "[(-F )...] "), + N_("git commit-tree [(-p )...] [-S[]] [(-m )...]\n" + " [(-F )...] "), NULL }; diff --git a/builtin/diagnose.c b/builtin/diagnose.c index 576e0e8e385..28c394a62a5 100644 --- a/builtin/diagnose.c +++ b/builtin/diagnose.c @@ -3,7 +3,8 @@ #include "diagnose.h" static const char * const diagnose_usage[] = { - N_("git diagnose [-o|--output-directory ] [-s|--suffix ] [--mode=]"), + N_("git diagnose [-o|--output-directory ] [-s|--suffix ]\n" + " [--mode=]"), NULL }; diff --git a/builtin/init-db.c b/builtin/init-db.c index 546f9c595e7..08ba006d55e 100644 --- a/builtin/init-db.c +++ b/builtin/init-db.c @@ -515,7 +515,8 @@ static int shared_callback(const struct option *opt, const char *arg, int unset) } static const char *const init_db_usage[] = { - N_("git init [-q | --quiet] [--bare] [--template=] [--shared[=]] []"), + N_("git init [-q | --quiet] [--bare] [--template=]\n" + " [--shared[=]] []"), NULL }; diff --git a/builtin/interpret-trailers.c b/builtin/interpret-trailers.c index 84748eafc01..4cf0cf265dc 100644 --- a/builtin/interpret-trailers.c +++ b/builtin/interpret-trailers.c @@ -13,7 +13,9 @@ #include "config.h" static const char * const git_interpret_trailers_usage[] = { - N_("git interpret-trailers [--in-place] [--trim-empty] [(--trailer [(=|:)])...] [...]"), + N_("git interpret-trailers [--in-place] [--trim-empty]\n" + " [(--trailer [(=|:)])...]\n" + " [...]"), NULL }; diff --git a/builtin/read-tree.c b/builtin/read-tree.c index 9f1f33e9546..b3a389e1b1f 100644 --- a/builtin/read-tree.c +++ b/builtin/read-tree.c @@ -38,7 +38,9 @@ static int list_tree(struct object_id *oid) } static const char * const read_tree_usage[] = { - N_("git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=) [-u | -i]] [--no-sparse-checkout] [--index-output=] (--empty | [ []])"), + N_("git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=)\n" + " [-u | -i]] [--no-sparse-checkout] [--index-output=]\n" + " (--empty | [ []])"), NULL }; diff --git a/builtin/show-branch.c b/builtin/show-branch.c index d3f5715e3e3..c013abaf942 100644 --- a/builtin/show-branch.c +++ b/builtin/show-branch.c @@ -14,7 +14,8 @@ static const char* show_branch_usage[] = { N_("git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" " [--current] [--color[=] | --no-color] [--sparse]\n" " [--more= | --list | --independent | --merge-base]\n" - " [--no-name | --sha1-name] [--topics] [( | )...]"), + " [--no-name | --sha1-name] [--topics]\n" + " [( | )...]"), N_("git show-branch (-g | --reflog)[=[,]] [--list] []"), NULL }; diff --git a/builtin/show-ref.c b/builtin/show-ref.c index 48569061087..3af6a53ee97 100644 --- a/builtin/show-ref.c +++ b/builtin/show-ref.c @@ -9,7 +9,9 @@ #include "parse-options.h" static const char * const show_ref_usage[] = { - N_("git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --hash[=]] [--abbrev[=]] [--tags] [--heads] [--] [...]"), + N_("git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference]\n" + " [-s | --hash[=]] [--abbrev[=]] [--tags]\n" + " [--heads] [--] [...]"), N_("git show-ref --exclude-existing[=]"), NULL }; -- 2.38.0.rc1.925.gb61c5ccd7da