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=1.3 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,LIST_MIRROR_RECEIVED,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=no 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 D3C361F852 for ; Thu, 3 Feb 2022 01:09:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348763AbiBCBHu (ORCPT ); Wed, 2 Feb 2022 20:07:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47950 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239803AbiBCBHt (ORCPT ); Wed, 2 Feb 2022 20:07:49 -0500 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 115AFC061714 for ; Wed, 2 Feb 2022 17:07:48 -0800 (PST) Received: by mail-ej1-x631.google.com with SMTP id a8so2864144ejc.8 for ; Wed, 02 Feb 2022 17:07:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:references:user-agent:in-reply-to :message-id:mime-version; bh=xpsc5jt1qXIT9mQJ3bwuAr1pZlGGaZaaZSy0F3EehwQ=; b=mDjNPLuS27rjdPg4FPYhb8sYhDoSB0Nw6ETj8rUFsGdCL3F3Hqal8TAluI/FOrfiby mWmdL2YL9TVuY+cqm64Vp4OekMZGVMJ1ksF5wtMvsgVIgIprzSYtGYafmNysYM4NECMw p+iwJpDhWiVJ2AuCXsUCfIXqAurnuJsewBzuZaIwO3+oI/B7xPjAaEd5bKOzOrxfAXHa qx9mpPCrFdwT7v2wyiyQtW5cnYn7nlEIPAHnNeMIhpb/gMcrMWteT/4nIiHYfG4UCErW JpiiT3qgDEdPbw+DB0KQSYqwze2QMOAhB8xdO4PO97LCm0ShW5e7NhxZrTQWm9WaQ90H 0XBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:references:user-agent :in-reply-to:message-id:mime-version; bh=xpsc5jt1qXIT9mQJ3bwuAr1pZlGGaZaaZSy0F3EehwQ=; b=lOTiodaMrMc+Yuz5Cg2XWoYCHL01E8JR4P3xb869FZGRx45i/B1VLs7d6byGix5yHf Vz/cno6WSA69VbMXxRKeE8gk247eP3QL6UWbY3deIgB9NsJHsGL21RmImisNxzNlVNYP dGddnrzHdmPS/B3ZP6OH0vnrwzYOwGDSfKSc7mXJulq9trjlzixcixwMFNKzmVFUb4qw a+qXj0KkFJBGXDPQ2TF7UuRj2jSzjlZ0dvN7+KCFIN1N93e34rsFujXuwB08ImYHcMmd tZUdOEWc9/T6cB3YJAnfS4tadqW3hVqaDc9tfT9+weqw2w7q7B9jBfOpP4HHyoxXVrAF PBEg== X-Gm-Message-State: AOAM530qh/zRYU7G2pANZfNBof2HNrW+GeXbgNEAVQfOL+VIvUih5gpi oITSsIMS3JkhPK5/8F9ommRAu1h8UDiLJw== X-Google-Smtp-Source: ABdhPJw0L0UosFOc4LMLJB9F12rZjiJlFd5EZHrnBv12Oz98iL8vRPcURv9j1o4cDgDTvvDyA2qWgw== X-Received: by 2002:a17:907:9495:: with SMTP id dm21mr27165999ejc.87.1643850466282; Wed, 02 Feb 2022 17:07:46 -0800 (PST) Received: from gmgdl (j120189.upc-j.chello.nl. [24.132.120.189]) by smtp.gmail.com with ESMTPSA id a6sm16195361ejs.214.2022.02.02.17.07.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Feb 2022 17:07:45 -0800 (PST) Received: from avar by gmgdl with local (Exim 4.95) (envelope-from ) id 1nFQbA-004npp-VN; Thu, 03 Feb 2022 02:07:44 +0100 From: =?utf-8?B?w4Z2YXIgQXJuZmrDtnLDsA==?= Bjarmason To: Elijah Newren via GitGitGadget Cc: git@vger.kernel.org, Christian Couder , Taylor Blau , Johannes Altmanninger , Ramsay Jones , Johannes Schindelin , Christian Couder , =?utf-8?Q?Ren=C3=A9?= Scharfe , Johannes Sixt , Elijah Newren Subject: Re: [PATCH v3 12/15] merge-tree: provide easy access to `ls-files -u` style info Date: Thu, 03 Feb 2022 00:55:48 +0100 References: <2188a8ca1e77f2f5f8249f8b810775205ad529a6.1643787281.git.gitgitgadget@gmail.com> User-agent: Debian GNU/Linux bookworm/sid; Emacs 27.1; mu4e 1.6.10 In-reply-to: <2188a8ca1e77f2f5f8249f8b810775205ad529a6.1643787281.git.gitgitgadget@gmail.com> Message-ID: <220203.86mtj87o67.gmgdl@evledraar.gmail.com> MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Wed, Feb 02 2022, Elijah Newren via GitGitGadget wrote: > From: Elijah Newren > > Much like `git merge` updates the index with information of the form > (mode, oid, stage, name) > provide this output for conflicted files for merge-tree as well. > Provide an --exclude-modes-oids-stages/-l option for users to exclude This. > +--exclude-oids-and-modes:: No longer matches this.