]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 813d9a9 b182658)
Merge branch 'ty/merge-tree-strategy-options'
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 Oct 2023 23:23:10 +0000 (16:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 Oct 2023 23:23:11 +0000 (16:23 -0700)
"git merge-tree" learned to take strategy backend specific options
via the "-X" option, like "git merge" does.

* ty/merge-tree-strategy-options:
  merge: introduce {copy|clear}_merge_options()
  merge-tree: add -X strategy option


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.