diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-10-18 13:25:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-18 13:25:42 -0700 |
| commit | 7906b5c957b239c4332efb8eb183673cdf952f2f (patch) | |
| tree | e0a65cad03c8fb4a82ba54bcb21ee7973ecb4209 /diff-merges.c | |
| parent | Merge branch 'sn/cat-file-doc-update' (diff) | |
| parent | merge-ort: initialize repo in index state (diff) | |
| download | git-7906b5c957b239c4332efb8eb183673cdf952f2f.tar.gz git-7906b5c957b239c4332efb8eb183673cdf952f2f.zip | |
Merge branch 'jc/merge-ort-attr-index-fix'
Fix "git merge-tree" to stop segfaulting when the --attr-source
option is used.
* jc/merge-ort-attr-index-fix:
merge-ort: initialize repo in index state
Diffstat (limited to 'diff-merges.c')
0 files changed, 0 insertions, 0 deletions