]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'en/merge-tree-check'
authorJunio C Hamano <gitster@pobox.com>
Tue, 27 May 2025 20:59:08 +0000 (13:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 May 2025 20:59:08 +0000 (13:59 -0700)
commitf545f401be93241cfefbeed3a25b63045c8fc3a7
tree8c85ec40b35601f22327445d8017f573b4f964d6
parent17d9dbd3c270aaa33487f6a03d128c47aea6b309
parent29d7bf19512d8ca97be5cf708ca2e0bcc29408ab
Merge branch 'en/merge-tree-check'

"git merge-tree" learned an option to see if it resolves cleanly
without actually creating a result.

* en/merge-tree-check:
  merge-tree: add a new --quiet flag
  merge-ort: add a new mergeability_only option