]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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

1  2 
merge-ort.c patch | diff1 | diff2 | blob | history

diff --cc merge-ort.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.