From patchwork Thu Oct 13 15:39:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 13006154 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 04F10C43217 for ; Thu, 13 Oct 2022 15:41:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229552AbiJMPlN (ORCPT ); Thu, 13 Oct 2022 11:41:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47884 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229837AbiJMPk3 (ORCPT ); Thu, 13 Oct 2022 11:40:29 -0400 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE47448EAA for ; Thu, 13 Oct 2022 08:39:56 -0700 (PDT) Received: by mail-wm1-x331.google.com with SMTP id c9-20020a05600c100900b003c6da0f9b62so1607423wmc.1 for ; Thu, 13 Oct 2022 08:39:55 -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=qUJQUdCePb0v6pwLUr1VCJk0/xvWMy++ReNKZuKDfU4=; b=hs89p/0KWzmjyZMOhpdGyasv5kBQHRlSyC6Q3tn4POiXpvW2ILhejAxUf8EouydClx k3XXqxmrJpJouECyH7t4yiBQ4Cl0b29VfMA5AhA5jherxlBNIEjQnMsWB6CqNguuqTku 1M2fsX1R4Rr57PV9Jmb2Wv36WujtNUh6wY9f6jlt7YhdUXsr+5Cm0P2MIwcTCuGf3umg raPk8DwKMBka71iTOA3Afpj9Rm718QFlc1AlYyQzd3VxgVdeGKz9uZwilkT16D5wrpK2 pPltHg1NA1g6Scu2HiphcvrKEY4RN+T52sKCeN9bTejxdlRn+ntdUBYo+KOvg+ILOlQV 1fRw== 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=qUJQUdCePb0v6pwLUr1VCJk0/xvWMy++ReNKZuKDfU4=; b=CvCoFd7jfRBkMGfOf/oeHCZSFptiHsLkovmSMHDUokZH3nC5ap2XmG+eSkes2/pRVf bXg1IO4/bw1ahSfSueR6meUdOWE7FYXEX8In/KgBDxfHHnjiG2Omg26j8gizN1QnX7GI 1ZjjblM+79ZA9sheN4YQmU/Rk1y+XNFZ9itNww2n/VeSwcKh5ht/AuE4ngbYQzuwamG4 x/RWV19Pp7yCEzNavj/PokgVN445qViqqMlO6HH7TShYqUE289GAeofWioQQG3qUP0hd QF4iRUgNqYTpOjf/wk6ImVvKy0lqhLO69crvaIQMdbbkpLNMA1oTu4+IaaynOJZ4DYDp tCCQ== X-Gm-Message-State: ACrzQf18dj08LAswcAdl6oiWZXxG+lQwv4SNTlu9EPKSEppFMehWlXyW Vs9YsXvUjTWnpZqcM544n5XRNYt9FXqhnA== X-Google-Smtp-Source: AMsMyM75ObUQhDTqQH2wICR8DZ2x1Zfj4mZIw6+iBfkPkjv4rCq/V4LwNzscHgGF2NgQ0C4QylC/Kg== X-Received: by 2002:a05:600c:5014:b0:3b5:889:58a5 with SMTP id n20-20020a05600c501400b003b5088958a5mr308870wmr.140.1665675593317; Thu, 13 Oct 2022 08:39:53 -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.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Oct 2022 08:39:52 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Victoria Dye , Taylor Blau , Emily Shaffer , Jonathan Nieder , John Cai , Eric Sunshine , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBC?= =?utf-8?b?amFybWFzb24=?= Subject: [PATCH v5 18/34] doc txt & -h consistency: make output order consistent Date: Thu, 13 Oct 2022 17:39:12 +0200 Message-Id: X-Mailer: git-send-email 2.38.0.1085.gb7e61c3016c In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Fix cases where the SYNOPSIS and -h output was presented in a different order. Signed-off-by: Ævar Arnfjörð Bjarmason --- builtin/merge-base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/merge-base.c b/builtin/merge-base.c index a11f8c6e4bb..6f3941f2a49 100644 --- a/builtin/merge-base.c +++ b/builtin/merge-base.c @@ -31,8 +31,8 @@ static int show_merge_base(struct commit **rev, int rev_nr, int show_all) static const char * const merge_base_usage[] = { N_("git merge-base [-a | --all] ..."), N_("git merge-base [-a | --all] --octopus ..."), - N_("git merge-base --independent ..."), N_("git merge-base --is-ancestor "), + N_("git merge-base --independent ..."), N_("git merge-base --fork-point []"), NULL };