From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-2.9 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,T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by dcvr.yhbt.net (Postfix) with ESMTP id 2120A1F542 for ; Thu, 1 Jun 2023 06:18:47 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=Gfs9E8FQ; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231297AbjFAGSp (ORCPT ); Thu, 1 Jun 2023 02:18:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40824 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230473AbjFAGSi (ORCPT ); Thu, 1 Jun 2023 02:18:38 -0400 Received: from mail-lj1-x22a.google.com (mail-lj1-x22a.google.com [IPv6:2a00:1450:4864:20::22a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2743899 for ; Wed, 31 May 2023 23:18:37 -0700 (PDT) Received: by mail-lj1-x22a.google.com with SMTP id 38308e7fff4ca-2afb2875491so5259901fa.1 for ; Wed, 31 May 2023 23:18:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685600315; x=1688192315; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=lchYZMJAS0dI9n0znXSxuHE9batmGmhiCkGp48RZKM8=; b=Gfs9E8FQWoUzOExH7VOaMGQ7FHddmFAsIzXaa06udZPNd3JAfRO094g1O4EwluVM9K ahtbI0vVEPIwI2xv1VKhP3ESFnxrv+h4OYFbB8ZEZGq3KUcuKN5MR7HRlP3hUWv36PLY t1isSL/Dm9FEXXo3n+ZnTYCPX6GjlxI7fHpdjf8SukRom5bTUQN2w0NS8JRO4Dc9JslS Kb6H2ymckksCNiePwvY4hc5PTBJrmq7+fmawgYiEPBlxlsstqmiwWLZyndNkcwHZgnNT N7P5EX5QtUKhpHFQXo0Q00zFNpC5mN2TQBCqfLxezCjk2svjtHLCRvolRv5LEEdKp5y3 uJgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685600315; x=1688192315; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lchYZMJAS0dI9n0znXSxuHE9batmGmhiCkGp48RZKM8=; b=M3PUnQDYQ9DEAAa0WQEnC/ZR4CpEL2rJn21BBU2LIRH1KxhUKqrS847PJnDZe+qYkS zn6fdB/VkIcYf/nO/hVGjdpbbRE92Njg3ABaWSWcb7qv1qI06XN7WXNWdPH3yEv8Pf0t a8pZ9sH1pnSvzinJIkMTFEFbF25xGUXu0OjO3ss/32bg/TaNCNVvhQNodOzjI7xzZS80 5UYRNrdGhoPIXxfQ49c9aqTwxBnAmUBr+6k19mqquwfaTwQkOykRXRTJnGGM46/pBRyK ah1mJioRk2fEOIZfxePMERkvZuu7oepyThXA6/R8LbWxGqPwaQZIi2XSyAjzsHVPhbK8 qvUg== X-Gm-Message-State: AC+VfDxqcKOG9i10FZM6qi33UlmShwlgfDfYDEBLDcYhDba1vl21H0S7 hATRQ0H03MpobgSTOTy3a01rN5WMEzu/9FuGkFjBWAHIaFE= X-Google-Smtp-Source: ACHHUZ4osi3zBxXJHOQ5TxXq+bCbRQYz0Y7mNgGsITZb1/AkFZBPfSXb4gU0ay4N2pWW5ALZ85kwIvsPPHuRig0rdgA= X-Received: by 2002:a2e:8382:0:b0:2ad:ad0b:d0fb with SMTP id x2-20020a2e8382000000b002adad0bd0fbmr4077618ljg.30.1685600315050; Wed, 31 May 2023 23:18:35 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Elijah Newren Date: Wed, 31 May 2023 23:18:22 -0700 Message-ID: Subject: Re: [PATCH v2 0/6] Document 'AUTO_MERGE' and more special refs To: Philippe Blain via GitGitGadget Cc: git@vger.kernel.org, Johannes Schindelin , Victoria Dye , Taylor Blau , Eric Sunshine , Felipe Contreras , Philippe Blain , Chris Torek Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Mon, May 22, 2023 at 12:29=E2=80=AFPM Philippe Blain via GitGitGadget wrote: > > Thanks everyone for the review! > > Changes since v1: > > * Addressed typos and wording suggestions from Elijah > * Incoporated Eric's wording suggestion > * Added a preliminary patch adressing Victoria's suggestion, based on th= e > what Taylor sent. > > This version is not a "fixups on top", it's a complete new version. I don= 't > see the point of merging typos to master if we can instead wait for 'next= ' > to be rebuilt after the upcoming release. I re-read the whole series. It addresses all the things I brought up in v1 (except the bonus idea I threw out there about mentioning how AUTO_MERGE is related to --remerge-diff), and all the things I remember others bringing up as well. Reviewed-by: Elijah Newren Thanks for working on this!