diff options
| author | Elijah Newren <newren@gmail.com> | 2022-06-18 00:20:53 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-06-22 16:10:06 -0700 |
| commit | b520bc6caa35e621396dd69ae4d84314615cf7ac (patch) | |
| tree | af3e9a8de28d77b9a9118e1ad7d05fd3892b0084 /diff.c | |
| parent | merge-tree: provide a list of which files have conflicts (diff) | |
| download | git-b520bc6caa35e621396dd69ae4d84314615cf7ac.tar.gz git-b520bc6caa35e621396dd69ae4d84314615cf7ac.zip | |
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 'diff.c')
0 files changed, 0 insertions, 0 deletions