]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cc7d718 e95bafc)
Merge branch 'jc/merge-ort-attr-index-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Oct 2023 20:25:42 +0000 (13:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Oct 2023 20:25:42 +0000 (13:25 -0700)
commit7906b5c957b239c4332efb8eb183673cdf952f2f
treee0a65cad03c8fb4a82ba54bcb21ee7973ecb4209tree | snapshot
parentcc7d7183f0a95ef5d7853106515db8b7c495997dcommit | diff
parente95bafc52f095b33b5a283179e08a44279c293d0commit | diff
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
merge-ort.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.