From: Elijah Newren Date: Thu, 03 Feb 2022 05:19:01 GMT Subject: Re: [PATCH v3 12/15] merge-tree: provide easy access to `ls-files -u` style info Message-ID: In-Reply-To: <220203.86mtj87o67.gmgdl@evledraar.gmail.com> On Wed, Feb 2, 2022 at 5:07 PM Ævar Arnfjörð Bjarmason wrote: > > 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. Thanks; good catch.