From: Ævar Arnfjörð Bjarmason Date: Wed, 02 Feb 2022 23:55:48 GMT Subject: Re: [PATCH v3 12/15] merge-tree: provide easy access to `ls-files -u` style info Message-ID: <220203.86mtj87o67.gmgdl@evledraar.gmail.com> In-Reply-To: <2188a8ca1e77f2f5f8249f8b810775205ad529a6.1643787281.git.gitgitgadget@gmail.com> 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.