Thread (218 messages) 218 messages, 10 authors, 2022-06-18

Re: [PATCH v3 12/15] merge-tree: provide easy access to `ls-files -u` style info

From: Ævar Arnfjörð Bjarmason <hidden>
Date: 2022-02-03 01:07:51

On Wed, Feb 02 2022, Elijah Newren via GitGitGadget wrote:
From: Elijah Newren <redacted>

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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help