Hi Junio & Elijah, On Wed, 22 Jun 2022, Elijah Newren wrote: > On Wed, Jun 22, 2022 at 12:41 PM Junio C Hamano <gitster@xxxxxxxxx> wrote: > > [Stalled] > > > > * 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. > > > > On hold. > > cf. <CABPp-BGZ7OAYRR5YKRsxJSo-C=ho+qcNAkqwkim8CkhCfCeHsA@xxxxxxxxxxxxxx> > > source: <pull.1122.v6.git.1645602413.gitgitgadget@xxxxxxxxx> > > Can you update from "On hold" to "new patchset exists" (new source: > <pull.1122.v7.git.1655511660.gitgitgadget@xxxxxxxxx>) and move it out > from the stalled section? > > (Also, FWIW, v7 was collaborative effort between Dscho and I, and > we're now finally both pretty happy with the state of the patches, as > noted over at https://lore.kernel.org/git/CABPp-BFfRGQybYManC6LfFTaAd3mweBxL=APCGP_vRF-WQxGSw@xxxxxxxxxxxxxx/). I would like to enthusiastically confirm from my side that what Elijah said is exactly how I see it, too. Thanks, Dscho
