]> git.ipfire.org Git - thirdparty/git.git/commit - perl/Git/IndexInfo.pm
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f9d29da c5a6f65)
Merge branch 'en/merge-ort-2'
authorJunio C Hamano <gitster@pobox.com>
Thu, 7 Jan 2021 07:33:44 +0000 (23:33 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 7 Jan 2021 07:33:44 +0000 (23:33 -0800)
commit85cf82ff01ed975c31b75540afb1b251da5259fd
tree4be6021a07f5db063798873e8fd3a3edacab8907tree | snapshot
parentf9d29daba64ae2c81ed62d0c1f4c5e4493247f6bcommit | diff
parentc5a6f65527aa3b6f5d7cf25437a88d8727ab0646commit | diff
Merge branch 'en/merge-ort-2'

More "ORT" merge strategy.

* en/merge-ort-2:
  merge-ort: add modify/delete handling and delayed output processing
  merge-ort: add die-not-implemented stub handle_content_merge() function
  merge-ort: add function grouping comments
  merge-ort: add a paths_to_free field to merge_options_internal
  merge-ort: add a path_conflict field to merge_options_internal
  merge-ort: add a clear_internal_opts helper
  merge-ort: add a few includes
Unnamed repository; edit this file 'description' to name the repository.