diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-10-20 16:23:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-20 16:23:11 -0700 |
| commit | c662038629a5fb9b604df0f4ae5d812799de52fe (patch) | |
| tree | 9bdc3c1b4feaa0050d7257565bae8defa1a7bcc4 /commit-graph.c | |
| parent | 813d9a91884e0afecec8ccf8e33909c405ee1d3f (diff) | |
| parent | b182658e3ed412e21a472db42ebc37130cee68e0 (diff) | |
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
Diffstat (limited to 'commit-graph.c')
0 files changed, 0 insertions, 0 deletions