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: AS53758 23.128.96.0/24 X-Spam-Status: No, score=-4.2 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,NICE_REPLY_A, RCVD_IN_DNSWL_LOW,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 2FC121F8C6 for ; Mon, 2 Aug 2021 14:59:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234313AbhHBO70 (ORCPT ); Mon, 2 Aug 2021 10:59:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55710 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233981AbhHBO7Z (ORCPT ); Mon, 2 Aug 2021 10:59:25 -0400 Received: from mail-qt1-x82b.google.com (mail-qt1-x82b.google.com [IPv6:2607:f8b0:4864:20::82b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 13A75C06175F for ; Mon, 2 Aug 2021 07:59:16 -0700 (PDT) Received: by mail-qt1-x82b.google.com with SMTP id a19so11827756qtx.1 for ; Mon, 02 Aug 2021 07:59:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=yGGMAD2xU/pMM6Y92bM9f+40PBzcOk6ZOp5CvekhaSc=; b=s1UzjyiylKou3B5BKRmA/OnUYMhO98Opg1/8yYnTU6Zxmh4+oVkn3B/ntK8BLEXVkB ateGxWq9qfj0FSwPGonDPgztMLrZwIpGoFBfw4Q5IvdEvpgdW3A/s9K5NSavG77m/ioh 5YDyBWjgRm1ud6oB5Uo8QR5OVg4JXsEJTsxii3SGD1v3ueuUGGvI35V37vVSA5zLsnVk bE1fOe9kDIG4HLNQ4rAKgyiXWkgswriKDQ2z+u1b5XlMIYJseN1qE+h0rYsrtMJ/XINs WzOTqnsa7UBDE7axBdhCCbbp8IX85Bf6qBJ+u/GPBGsrRiFFBlpYf1rT+o+go7M6T0qx qxwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=yGGMAD2xU/pMM6Y92bM9f+40PBzcOk6ZOp5CvekhaSc=; b=WvLFU3kKXViB5S74gmAKiHXBv7hkZXarWtbzW2nscOs/4i2eXcM4CL5WrKD5Z/moJo toQXc9cBt6BPhiB1Z0EmXPbhUDTEKZoedDj6Vq57u4t6nGkdkbBPaWipQoRBlhUYZi6H oWBVz4dQ1WQXKfJj6TInY1v48B6JKHHi013lEQh2vqnEy9dZ+vDd5jJLDX584UpICcko Zt9eQ7IpD4pZfaLSd7CwZJnzPT0ym1N2bVorJZDmEMextjiJ1rsRX5fwoRyJHJTZwb2L fs/ZsAAoZA6wlttc6k91crehY1TbmP+b/k/vFfMZ15wcSAnKeD73T5SyzlFb8Mr3MRYV L+Wg== X-Gm-Message-State: AOAM532G+x0DCITEXPR1YNILM48+Dl4dAG7Z2RKm8FiQlA2bbVsMU07+ C2+A9NTOCQZnd+iC8Fl6YVw= X-Google-Smtp-Source: ABdhPJxQL57hD/Yb3GydbhZZ9tBekcYAePa8haB0HioQUKNS5wESq+DxIKHlATNqbN3Qbr3QjnsBaw== X-Received: by 2002:a05:622a:134f:: with SMTP id w15mr14675641qtk.24.1627916355147; Mon, 02 Aug 2021 07:59:15 -0700 (PDT) Received: from ?IPv6:2600:1700:e72:80a0:34d1:2d41:f9b7:ccbc? ([2600:1700:e72:80a0:34d1:2d41:f9b7:ccbc]) by smtp.gmail.com with ESMTPSA id n5sm5890950qkp.116.2021.08.02.07.59.13 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 02 Aug 2021 07:59:14 -0700 (PDT) Subject: Re: [PATCH 2/2] Update docs for change of default merge backend To: Elijah Newren via GitGitGadget , git@vger.kernel.org Cc: Christian Couder , Derrick Stolee , Emily Shaffer , Eric Sunshine , Jeff King , Johannes Schindelin , Jonathan Nieder , Jonathan Tan , Junio C Hamano , Phillip Wood , =?UTF-8?Q?Ren=c3=a9_Scharfe?= , Taylor Blau , =?UTF-8?B?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= , Elijah Newren References: <35490397590ae4d39ba98c7eb206bfadc22ddf35.1627776462.git.gitgitgadget@gmail.com> From: Derrick Stolee Message-ID: <4f223333-7cbb-2304-2e81-dc91a3281241@gmail.com> Date: Mon, 2 Aug 2021 10:59:12 -0400 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: <35490397590ae4d39ba98c7eb206bfadc22ddf35.1627776462.git.gitgitgadget@gmail.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On 7/31/2021 8:07 PM, Elijah Newren via GitGitGadget wrote: > From: Elijah Newren ... > diff --git a/Documentation/gitfaq.txt b/Documentation/gitfaq.txt > index afdaeab8503..072bf84fa8a 100644 > --- a/Documentation/gitfaq.txt > +++ b/Documentation/gitfaq.txt > @@ -275,7 +275,7 @@ best to always use a regular merge commit. > > [[merge-two-revert-one]] > If I make a change on two branches but revert it on one, why does the merge of those branches include the change?:: > - By default, when Git does a merge, it uses a strategy called the recursive > + By default, when Git does a merge, it uses a strategy called the ort > strategy, which does a fancy three-way merge. In such a case, when Git nit: I feel like quotes around "ort" would be beneficial here. It would have also helped the previous version, too, in my opinion. > performs the merge, it considers exactly three points: the two heads and a > third point, called the _merge base_, which is usually the common ancestor of > diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt > index eb0aabd396f..72b53188504 100644 > --- a/Documentation/merge-options.txt > +++ b/Documentation/merge-options.txt > @@ -112,8 +112,8 @@ With --squash, --commit is not allowed, and will fail. > Use the given merge strategy; can be supplied more than > once to specify them in the order they should be tried. > If there is no `-s` option, a built-in list of strategies > - is used instead ('git merge-recursive' when merging a single > - head, 'git merge-octopus' otherwise). > + is used instead (`ort` when merging a single head, > + `octopus` otherwise). > > -X