diff options
| author | Elijah Newren <newren@gmail.com> | 2022-06-18 03:20:53 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-06-23 02:10:06 +0300 |
| commit | b520bc6caa35e621396dd69ae4d84314615cf7ac (patch) | |
| tree | af3e9a8de28d77b9a9118e1ad7d05fd3892b0084 /merge-ort.h | |
| parent | 7fa3338870d66dd3946c5c3a0bd09dadb798893d (diff) | |
merge-tree: provide easy access to `ls-files -u` style info
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 a --name-only option for users to exclude the mode, oid, and
stage and only get the list of conflicted filenames.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-ort.h')
0 files changed, 0 insertions, 0 deletions