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.8 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,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 170521F910 for ; Fri, 25 Nov 2022 05:29:22 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ewmXcQJP"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229491AbiKYF26 (ORCPT ); Fri, 25 Nov 2022 00:28:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46660 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229436AbiKYF25 (ORCPT ); Fri, 25 Nov 2022 00:28:57 -0500 Received: from mail-pj1-x102f.google.com (mail-pj1-x102f.google.com [IPv6:2607:f8b0:4864:20::102f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E96B826135 for ; Thu, 24 Nov 2022 21:28:56 -0800 (PST) Received: by mail-pj1-x102f.google.com with SMTP id a22-20020a17090a6d9600b0021896eb5554so6733726pjk.1 for ; Thu, 24 Nov 2022 21:28:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:date:references:subject:cc:to :from:sender:from:to:cc:subject:date:message-id:reply-to; bh=tV9o45ZQPZsh27bM8I/z8eoLXRoOD472z3Xp2vpG5W0=; b=ewmXcQJPuEW/y0BU0N0ZqSnlBzC25YfI8Re5x2lmv20W863KFzPwc6vln1rd5f4/ch t7821bCjLIl7eXGLX7N/ATY7eeRlkRTR9/t8dbDMtiuhTkyZnU1A0vJq35wsVdJ7s4Xj 6Q5TPEBuBJpL888XBTsWYcdoAqzY3vmw1bU+eIat+4cm1KgS348UfHzNPO1zDS4YosYe P8lktgPCM9H/xfwyx8BBT09OVm1BVCDpMji3oKBecfHPeaEmMEk/3pEnuBPOVmil9rdc mC+HICd2sFNO6t8+WgmfVUz2JctKDya8xoy5qLcEx5GpuxP4zO+/eelRY/Ej7nQNUQpG 6kmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:date:references:subject:cc:to :from:sender:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=tV9o45ZQPZsh27bM8I/z8eoLXRoOD472z3Xp2vpG5W0=; b=POW3Ov20n6ypGqSYpXALfP9XWBwpzaXyV3c8sObMXdqD/ToV52SPr99aIYSdz1KV/6 QuWDldPZMGTjmFBa9YGTPKys7cupEvYzrqR5h37IABdettJSZtKabBSLClslc4T3lvFV OC6AxLCyZFPThpzT44l+/C9DnbyUvPJ5061ZfTO1rJUCAolANBG0pVFFuwAqleOUBipn gtSTJTBfrjYyivdNANPvDgQsFbNaMutwfBytPYnLQCMPWGRZoGxNnvcvnKM4nTQxVZ24 pDBU6VR3ZA3PEnlxZypibmRuzoOF72l2S4C+RMG2yQa+/KdAU+blJYp+zBuaD5qJCD0+ rXYg== X-Gm-Message-State: ANoB5pmBkHyxym47STriThnFDiZrpN00PRDBuvLxPse77sQNM+ZkxfaR yiRgNwKNE1dlAOess599ABEcby3yDo1gAg== X-Google-Smtp-Source: AA0mqf5KlsFJhR6whNqpRJobsjYzGP5zq7RmoEWzv34MJrNOdprYNM7HPMgA31asfyNTJuLJP5slYg== X-Received: by 2002:a17:902:ab89:b0:186:88bd:e656 with SMTP id f9-20020a170902ab8900b0018688bde656mr17516936plr.137.1669354136359; Thu, 24 Nov 2022 21:28:56 -0800 (PST) Received: from localhost (33.5.83.34.bc.googleusercontent.com. [34.83.5.33]) by smtp.gmail.com with ESMTPSA id r29-20020a63205d000000b0046ec0ef4a7esm1821434pgm.78.2022.11.24.21.28.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 21:28:55 -0800 (PST) Sender: Junio C Hamano From: Junio C Hamano To: "Kyle Zhao via GitGitGadget" Cc: git@vger.kernel.org, Elijah Newren , kylezhao , Taylor Blau , =?utf-8?B?w4Z2?= =?utf-8?B?YXIgQXJuZmrDtnLDsA==?= Bjarmason Subject: Re: [PATCH v8 3/3] docs: fix description of the `--merge-base` option References: Date: Fri, 25 Nov 2022 14:28:55 +0900 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org "Kyle Zhao via GitGitGadget" writes: > From: Kyle Zhao > > Signed-off-by: Kyle Zhao > --- > Documentation/git-merge-tree.txt | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.txt > index 298c133fdb6..88ee942101a 100644 > --- a/Documentation/git-merge-tree.txt > +++ b/Documentation/git-merge-tree.txt > @@ -66,8 +66,8 @@ OPTIONS > > --merge-base=:: > Instead of finding the merge-bases for and , > - specify a merge-base for the merge. This option is incompatible > - with `--stdin`. > + specify a merge-base for the merge, and specifying multiple bases is > + currently not supported. This option is incompatible with `--stdin`. Makes sense. Will queue. Thanks.