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=2.5 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 1053F1F670 for ; Wed, 2 Mar 2022 01:28:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238909AbiCBB2m (ORCPT ); Tue, 1 Mar 2022 20:28:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52622 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238915AbiCBB2k (ORCPT ); Tue, 1 Mar 2022 20:28:40 -0500 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F04813DA4D for ; Tue, 1 Mar 2022 17:27:51 -0800 (PST) Received: by mail-ej1-x629.google.com with SMTP id gb39so587211ejc.1 for ; Tue, 01 Mar 2022 17:27:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=ai/FEsWNKavn7Pmob7mqFgTEXh2XmQvDW0k/pJuHmHQ=; b=hD7/YboqvEMFXZPgOY91FImVeFS9pFw0kwyjOB0wNjwlyPAGR6vdieUm8IAYMRNcFn /RaPPyMMIVMsOsaTvCyqJfhKjrtLQfO5bjMkvaPO7YLl0q8uG/QYnyyW6nz2RN537f/p UU5LDu/czfa6eaxG2lsjn+c6Av4YYSWEk4QNGUOWI6KvYUKbJA9JXQOKKMpysCWsnXGV jqfhAcjp4dMAAjLvYyG/zeUUeayt0007qjMxS5AZHqTSKCsT5v6wpPgklu98F/gyOWHX MSNGPHfU+uL5fT6npUwvvwGgzLxxhX6mW1HvVNVh0FTw/h84CTSUmdCtxTux91C+IBs4 JDkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=ai/FEsWNKavn7Pmob7mqFgTEXh2XmQvDW0k/pJuHmHQ=; b=IuRCaB1547NTOaQP+qsqCi3g8fV/6NYA5IZq7GU/a4fai4ed8ZXghWCAa0g0rJDr7+ gIANa39qyoDHDKAr9CSMXDA3OFnWjcq4bjBeg5iUADFf9NW+8nAocIY8fgaXKdisbkvs J41KyTwonhGOX7Siys89kI9o3PWPI7eJBfisNGYsilXA8+vNQepmXrHIk5cqIqhQM5WK ePWY/O9VVk6MqTu8GZxOlnZYU8vVca4f4MvXv731E6WefZyN2C1EVz622+yI8MRvy6/3 f33BQe7u80eWBT7djh/wxA7CJVTcc75Z2mwZBnP+XdvMQouJF7bHdQ8MkgD+IuaHGa1P OPNw== X-Gm-Message-State: AOAM532MqMb7RzINrFurql3DimlWYAHDEmqZDJ5zJL9Pxtv7LliE8Imh +Yf2pY9atGj2tq/+qB7p3LaMIidrAJUBAx/Nzdc2Rcj/BkTIeA== X-Google-Smtp-Source: ABdhPJzbYRLHIRHsTTRcsfP00JEbyizjPgD4Nca5MDxefsEozRP8wMIYinHtzlX+nvgX2oRnSHvbg3wgI+7utmt3sWk= X-Received: by 2002:a17:906:3a18:b0:6cd:ba45:995f with SMTP id z24-20020a1709063a1800b006cdba45995fmr21718317eje.328.1646184470164; Tue, 01 Mar 2022 17:27:50 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Elijah Newren Date: Tue, 1 Mar 2022 17:26:00 -0800 Message-ID: Subject: en/merge-tree (Was: Re: What's cooking in git.git (Feb 2022, #08; Mon, 28)) To: Junio C Hamano Cc: Git Mailing List Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Tue, Mar 1, 2022 at 7:26 AM Junio C Hamano wrote: > > * en/merge-tree (2022-02-23) 13 commits > - git-merge-tree.txt: add a section on potentional usage mistakes > - merge-tree: add a --allow-unrelated-histories flag > - merge-tree: allow `ls-files -u` style info to be NUL terminated > - merge-tree: provide easy access to `ls-files -u` style info > - merge-tree: provide a list of which files have conflicts > - merge-ort: provide a merge_get_conflicted_files() helper function > - merge-tree: support including merge messages in output > - merge-ort: split out a separate display_update_messages() function > - merge-tree: implement real merges > - merge-tree: add option parsing and initial shell for real merge function > - merge-tree: move logic for existing merge into new function > - merge-tree: rename merge_trees() to trivial_merge_trees() > - Merge branch 'en/remerge-diff' into en/merge-trees > > A new command is introduced that takes two commits and computes a > tree that would be contained in the resulting merge commit, if the > histories leading to these two commits were to be merged, and is > added as a new mode of "git merge-tree" subcommand. > > Will merge to 'next'. > source: As I mentioned on the last "What's cooking", let's not. Please mark it as expecting a reroll instead. I'm waiting to hear back from Dscho on whether my latest proposal at [1] would solve his usecase. That proposal suggests output format and various code changes. [1] https://lore.kernel.org/git/CABPp-BGnqXdFBNAyKRXgvCHv+aUZTMg-CgcQf95dKAR-e1zSjQ@mail.gmail.com/