diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-08-15 09:20:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-08-15 09:20:27 -0700 |
| commit | 230296d5603f39f1b2ef9fd3d0eb23e0f7ae88dc (patch) | |
| tree | a59b087ca08e084e3d1a2c9106216e81e710ca70 /t/t4013/diff.diff_--stat_initial..side | |
| parent | 90d7103396e50617f76fe5f49043266c3f0b827a (diff) | |
| parent | 94cf62176ec5e416b7748d60b59bf8f6aa6dd7b3 (diff) | |
Merge branch 'jc/add-resolved'
'git add' has been taught a new '--resolved' option to stage
conflict-resolved paths, while leaving unrelated local changes
unstaged. It scans the unmerged paths for leftover conflict
markers and aborts if any are found.
* jc/add-resolved:
add: introduce '--resolved' option
read-cache: add remove_file_from_index_with_flags()
merge-ll: consolidate conflict marker scanning logic
read-cache: reindent
Diffstat (limited to 't/t4013/diff.diff_--stat_initial..side')
0 files changed, 0 insertions, 0 deletions