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.5 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 DFB7A1F523 for ; Thu, 13 Oct 2022 15:41:14 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="F/kzXolt"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229936AbiJMPlE (ORCPT ); Thu, 13 Oct 2022 11:41:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45542 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229907AbiJMPkL (ORCPT ); Thu, 13 Oct 2022 11:40:11 -0400 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C4EE740552 for ; Thu, 13 Oct 2022 08:39:57 -0700 (PDT) Received: by mail-wm1-x32f.google.com with SMTP id l32so1460589wms.2 for ; Thu, 13 Oct 2022 08:39:57 -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 :message-id:reply-to; bh=OUGCq7uSC6IH5NBFyax5sUExXC5H3CCmj6jVcUWg98M=; b=F/kzXoltzgg1ZkmR0tcEIp2DYLpZ33ZDYv0O/qm28M1bWYEdxVnZir7ELrzVsLFAsT cGKlnjLj0A6Zedf1HXyluE/jp4EJe/FyQZ9o79VxixZOH5UcpEzMGjnA1aQIB0C8fX7w aHo1CtuHFhgaxS5j/3P3J1B7dXMGS75aKBIFETSB4Zn3cq0EtRUm4aDk5CtLuND0CjYX YuV51/YcWcS4zGiTrXI2nTPVie8U/8GlzOPjDd28iNMtJmITkzQMGu++MlCN9HbICA2E xvDd0KJgTC0NFYJtavPaeWTVuwkeIMRpxpGs2P/fbW3b6z9q5RLskbB5M+8jlcm206Mv AEsg== 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:message-id:reply-to; bh=OUGCq7uSC6IH5NBFyax5sUExXC5H3CCmj6jVcUWg98M=; b=ijNsmRnLixIDWru/KoEwCEHmT99U/rd1RM9VYhXMx6vWWk48YHCXC0RxQY3JlH6qsZ MUR5qI1oGtBGLvg7Dnouwez/BcDjEK6ck9GeMKuE5+RXg/08Hb4kC39ItxN3qeN5sSsO Jbal1GlmULtmqarB/e1FKFEuMsQDWOVV4mlCrMQDsU67MSHxptfksGj78JphzLIUsb9L /CBNJyPJ+KmpNv9oWiSZgYvmJqFRDtrTP7Dg1qraPY88rMC8mwEXPmE1Sq8lzR72pFZN EGpW3vyR73mbFJTOxm0a/TiLN4x+dKL6GoPIpqShifk8CnZF2bus8Hw6VhwkExc5orC6 fxJQ== X-Gm-Message-State: ACrzQf1iLvbySl70USVk8lIMZRzc6PeW96jov8pSETyfnlRshBS74ZE9 cUYgl/MBwaD4L3VtNvo1er0nNphLay/qfA== X-Google-Smtp-Source: AMsMyM78N1EShChtriDbJl5/kZzUwYC7MauL6vMVMfhxxz9XO1Tyspa4PguS2SWMq3tjoY72WrRvNw== X-Received: by 2002:a05:600c:4fd2:b0:3c6:db8a:4d2a with SMTP id o18-20020a05600c4fd200b003c6db8a4d2amr303503wmq.178.1665675595586; Thu, 13 Oct 2022 08:39:55 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id da12-20020a056000408c00b0022a3a887ceasm2258130wrb.49.2022.10.13.08.39.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Oct 2022 08:39:54 -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 v5 20/34] doc txt & -h consistency: make "rerere" consistent Date: Thu, 13 Oct 2022 17:39:14 +0200 Message-Id: X-Mailer: git-send-email 2.38.0.1085.gb7e61c3016c 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 For "rerere" say "pathspec" consistently, and list the subcommands in the order that they're discussed in the "COMMANDS" section of the documentation. Signed-off-by: Ævar Arnfjörð Bjarmason --- Documentation/git-rerere.txt | 2 +- builtin/rerere.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt index 9d0e6f53e7e..992b469270c 100644 --- a/Documentation/git-rerere.txt +++ b/Documentation/git-rerere.txt @@ -8,7 +8,7 @@ git-rerere - Reuse recorded resolution of conflicted merges SYNOPSIS -------- [verse] -'git rerere' [clear | forget | diff | remaining | status | gc] +'git rerere' [clear | forget ... | diff | status | remaining | gc] DESCRIPTION ----------- diff --git a/builtin/rerere.c b/builtin/rerere.c index 12570537d37..8b7392d5b44 100644 --- a/builtin/rerere.c +++ b/builtin/rerere.c @@ -10,7 +10,7 @@ #include "pathspec.h" static const char * const rerere_usage[] = { - N_("git rerere [clear | forget ... | status | remaining | diff | gc]"), + N_("git rerere [clear | forget ... | diff | status | remaining | gc]"), NULL, }; -- 2.38.0.1085.gb7e61c3016c