]> git.ipfire.org Git - thirdparty/git.git/commit
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)
commitc662038629a5fb9b604df0f4ae5d812799de52fe
tree9bdc3c1b4feaa0050d7257565bae8defa1a7bcc4
parent813d9a91884e0afecec8ccf8e33909c405ee1d3f
parentb182658e3ed412e21a472db42ebc37130cee68e0
Merge branch 'ty/merge-tree-strategy-options'

"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